aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ide/ide-cd.c5
-rw-r--r--drivers/ide/ide-floppy.c5
-rw-r--r--drivers/ide/ide-tape.c5
3 files changed, 0 insertions, 15 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 043129c422fe..d99847157186 100644
--- 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)
2106 goto failed; 2106 goto failed;
2107 } 2107 }
2108 } 2108 }
2109 if (drive->scsi) {
2110 printk(KERN_INFO "ide-cd: passing drive %s to ide-scsi "
2111 "emulation.\n", drive->name);
2112 goto failed;
2113 }
2114 info = kzalloc(sizeof(struct cdrom_info), GFP_KERNEL); 2109 info = kzalloc(sizeof(struct cdrom_info), GFP_KERNEL);
2115 if (info == NULL) { 2110 if (info == NULL) {
2116 printk(KERN_ERR "%s: Can't allocate a cdrom structure\n", 2111 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 cff90c4b217e..a7c138dc324c 100644
--- 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)
1579 " of ide-floppy\n", drive->name); 1579 " of ide-floppy\n", drive->name);
1580 goto failed; 1580 goto failed;
1581 } 1581 }
1582 if (drive->scsi) {
1583 printk(KERN_INFO "ide-floppy: passing drive %s to ide-scsi"
1584 " emulation.\n", drive->name);
1585 goto failed;
1586 }
1587 floppy = kzalloc(sizeof(idefloppy_floppy_t), GFP_KERNEL); 1582 floppy = kzalloc(sizeof(idefloppy_floppy_t), GFP_KERNEL);
1588 if (!floppy) { 1583 if (!floppy) {
1589 printk(KERN_ERR "ide-floppy: %s: Can't allocate a floppy" 1584 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 63b837ef7e05..2a362138f973 100644
--- 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)
2850 " the driver\n", drive->name); 2850 " the driver\n", drive->name);
2851 goto failed; 2851 goto failed;
2852 } 2852 }
2853 if (drive->scsi) {
2854 printk(KERN_INFO "ide-tape: passing drive %s to ide-scsi"
2855 " emulation.\n", drive->name);
2856 goto failed;
2857 }
2858 tape = kzalloc(sizeof(idetape_tape_t), GFP_KERNEL); 2853 tape = kzalloc(sizeof(idetape_tape_t), GFP_KERNEL);
2859 if (tape == NULL) { 2854 if (tape == NULL) {
2860 printk(KERN_ERR "ide-tape: %s: Can't allocate a tape struct\n", 2855 printk(KERN_ERR "ide-tape: %s: Can't allocate a tape struct\n",