lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ide-{cd,floppy,tape}: remove checking for drive->scsi

Browse Source 
Remove checking for drive->scsi which is no longer set by IDE core code
(leave the flag since it will be re-used for generic ATAPI support).

Cc: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2008-07-15 21:21:57 +02:00
parent 5d41893c0f
commit 794cc6804b
3 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/ide/ide-cd.c
View File

@@ -2106,11 +2106,6 @@ static int ide_cd_probe(ide_drive_t *drive)
goto failed; goto failed;
} }
} }
if (drive->scsi) {
printk(KERN_INFO "ide-cd: passing drive %s to ide-scsi "
"emulation.\n", drive->name);
goto failed;
}
info = kzalloc(sizeof(struct cdrom_info), GFP_KERNEL); info = kzalloc(sizeof(struct cdrom_info), GFP_KERNEL);
if (info == NULL) { if (info == NULL) {
printk(KERN_ERR "%s: Can't allocate a cdrom structure\n", printk(KERN_ERR "%s: Can't allocate a cdrom structure\n",

5
drivers/ide/ide-floppy.c
View File

@@ -1579,11 +1579,6 @@ static int ide_floppy_probe(ide_drive_t *drive)
" of ide-floppy\n", drive->name); " of ide-floppy\n", drive->name);
goto failed; goto failed;
} }
if (drive->scsi) {
printk(KERN_INFO "ide-floppy: passing drive %s to ide-scsi"
" emulation.\n", drive->name);
goto failed;
}
floppy = kzalloc(sizeof(idefloppy_floppy_t), GFP_KERNEL); floppy = kzalloc(sizeof(idefloppy_floppy_t), GFP_KERNEL);
if (!floppy) { if (!floppy) {
printk(KERN_ERR "ide-floppy: %s: Can't allocate a floppy" printk(KERN_ERR "ide-floppy: %s: Can't allocate a floppy"

5
drivers/ide/ide-tape.c
View File

@@ -2850,11 +2850,6 @@ static int ide_tape_probe(ide_drive_t *drive)
" the driver\n", drive->name); " the driver\n", drive->name);
goto failed; goto failed;
} }
if (drive->scsi) {
printk(KERN_INFO "ide-tape: passing drive %s to ide-scsi"
" emulation.\n", drive->name);
goto failed;
}
tape = kzalloc(sizeof(idetape_tape_t), GFP_KERNEL); tape = kzalloc(sizeof(idetape_tape_t), GFP_KERNEL);
if (tape == NULL) { if (tape == NULL) {
printk(KERN_ERR "ide-tape: %s: Can't allocate a tape struct\n", printk(KERN_ERR "ide-tape: %s: Can't allocate a tape struct\n",