diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-15 15:21:57 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-15 15:21:57 -0400 |
commit | 794cc6804bb946826b7427d205ac391a5370d361 (patch) | |
tree | 7717c37c6cc8650a36408b8744df534191555918 /drivers/ide/ide-floppy.c | |
parent | 5d41893c0f9caf94b449eada0279a08c86f0212e (diff) |
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>
Diffstat (limited to 'drivers/ide/ide-floppy.c')
-rw-r--r-- | drivers/ide/ide-floppy.c | 5 |
1 files changed, 0 insertions, 5 deletions
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" |