ide: remove needless drive->present checks from device drivers
Remove needless drive->present checks from ->probe methods (device model takes care of that). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
3cd5f1eae0
commit
2a924662b6
|
@ -2109,10 +2109,10 @@ static int ide_cd_probe(ide_drive_t *drive)
|
||||||
|
|
||||||
if (!strstr("ide-cdrom", drive->driver_req))
|
if (!strstr("ide-cdrom", drive->driver_req))
|
||||||
goto failed;
|
goto failed;
|
||||||
if (!drive->present)
|
|
||||||
goto failed;
|
|
||||||
if (drive->media != ide_cdrom && drive->media != ide_optical)
|
if (drive->media != ide_cdrom && drive->media != ide_optical)
|
||||||
goto failed;
|
goto failed;
|
||||||
|
|
||||||
/* skip drives that we were told to ignore */
|
/* skip drives that we were told to ignore */
|
||||||
if (ignore != NULL) {
|
if (ignore != NULL) {
|
||||||
if (strstr(ignore, drive->name)) {
|
if (strstr(ignore, drive->name)) {
|
||||||
|
|
|
@ -1136,8 +1136,7 @@ static int ide_disk_probe(ide_drive_t *drive)
|
||||||
/* strstr("foo", "") is non-NULL */
|
/* strstr("foo", "") is non-NULL */
|
||||||
if (!strstr("ide-disk", drive->driver_req))
|
if (!strstr("ide-disk", drive->driver_req))
|
||||||
goto failed;
|
goto failed;
|
||||||
if (!drive->present)
|
|
||||||
goto failed;
|
|
||||||
if (drive->media != ide_disk)
|
if (drive->media != ide_disk)
|
||||||
goto failed;
|
goto failed;
|
||||||
|
|
||||||
|
|
|
@ -1390,10 +1390,10 @@ static int ide_floppy_probe(ide_drive_t *drive)
|
||||||
|
|
||||||
if (!strstr("ide-floppy", drive->driver_req))
|
if (!strstr("ide-floppy", drive->driver_req))
|
||||||
goto failed;
|
goto failed;
|
||||||
if (!drive->present)
|
|
||||||
goto failed;
|
|
||||||
if (drive->media != ide_floppy)
|
if (drive->media != ide_floppy)
|
||||||
goto failed;
|
goto failed;
|
||||||
|
|
||||||
if (!idefloppy_identify_device(drive, drive->id)) {
|
if (!idefloppy_identify_device(drive, drive->id)) {
|
||||||
printk(KERN_ERR "ide-floppy: %s: not supported by this version"
|
printk(KERN_ERR "ide-floppy: %s: not supported by this version"
|
||||||
" of ide-floppy\n", drive->name);
|
" of ide-floppy\n", drive->name);
|
||||||
|
|
|
@ -2647,10 +2647,10 @@ static int ide_tape_probe(ide_drive_t *drive)
|
||||||
|
|
||||||
if (!strstr("ide-tape", drive->driver_req))
|
if (!strstr("ide-tape", drive->driver_req))
|
||||||
goto failed;
|
goto failed;
|
||||||
if (!drive->present)
|
|
||||||
goto failed;
|
|
||||||
if (drive->media != ide_tape)
|
if (drive->media != ide_tape)
|
||||||
goto failed;
|
goto failed;
|
||||||
|
|
||||||
if (!idetape_identify_device(drive)) {
|
if (!idetape_identify_device(drive)) {
|
||||||
printk(KERN_ERR "ide-tape: %s: not supported by this version of"
|
printk(KERN_ERR "ide-tape: %s: not supported by this version of"
|
||||||
" the driver\n", drive->name);
|
" the driver\n", drive->name);
|
||||||
|
|
|
@ -822,7 +822,6 @@ static int ide_scsi_probe(ide_drive_t *drive)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
if (!strstr("ide-scsi", drive->driver_req) ||
|
if (!strstr("ide-scsi", drive->driver_req) ||
|
||||||
!drive->present ||
|
|
||||||
drive->media == ide_disk ||
|
drive->media == ide_disk ||
|
||||||
!(host = scsi_host_alloc(&idescsi_template,sizeof(idescsi_scsi_t))))
|
!(host = scsi_host_alloc(&idescsi_template,sizeof(idescsi_scsi_t))))
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
Loading…
Reference in a new issue