Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 794cc680 authored Jul 15, 2008 by Bartlomiej Zolnierkiewicz

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>

parent 5d41893c

drivers/ide/ide-cd.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -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",

drivers/ide/ide-floppy.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -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"

drivers/ide/ide-tape.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -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",