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

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>

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 043129c422fe054a7cb1fcdaa4d44ae54576cfd8..d99847157186e9669efd3f56bfdb5eac54de7042 100644 (file)
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -2106,11 +2106,6 @@ static int ide_cd_probe(ide_drive_t *drive)
                        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);
        if (info == NULL) {
                printk(KERN_ERR "%s: Can't allocate a cdrom structure\n",

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index cff90c4b217ed921a4ec121473d9be29cf6f57dc..a7c138dc324c4c6e0f0e9585c4cf5dad444c6e6c 100644 (file)
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -1579,11 +1579,6 @@ static int ide_floppy_probe(ide_drive_t *drive)
                                " of ide-floppy\n", drive->name);
                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);
        if (!floppy) {
                printk(KERN_ERR "ide-floppy: %s: Can't allocate a floppy"

diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 63b837ef7e05ba08a7f1aa771f981bf25e78f2a0..2a362138f97310f6ca6c8060eccbad2dab3d2fe8 100644 (file)
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -2850,11 +2850,6 @@ static int ide_tape_probe(ide_drive_t *drive)
                                " the driver\n", drive->name);
                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);
        if (tape == NULL) {
                printk(KERN_ERR "ide-tape: %s: Can't allocate a tape struct\n",