Skip to content

Commit

Permalink
ide: remove needless drive->present checks from device drivers
Browse files Browse the repository at this point in the history
Remove needless drive->present checks from ->probe methods
(device model takes care of that).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Oct 10, 2008
1 parent 3cd5f1e commit 2a92466
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 9 deletions.
4 changes: 2 additions & 2 deletions drivers/ide/ide-cd.c
Original file line number Diff line number Diff line change
Expand Up @@ -2109,10 +2109,10 @@ static int ide_cd_probe(ide_drive_t *drive)

if (!strstr("ide-cdrom", drive->driver_req))
goto failed;
if (!drive->present)
goto failed;

if (drive->media != ide_cdrom && drive->media != ide_optical)
goto failed;

/* skip drives that we were told to ignore */
if (ignore != NULL) {
if (strstr(ignore, drive->name)) {
Expand Down
3 changes: 1 addition & 2 deletions drivers/ide/ide-disk.c
Original file line number Diff line number Diff line change
Expand Up @@ -1136,8 +1136,7 @@ static int ide_disk_probe(ide_drive_t *drive)
/* strstr("foo", "") is non-NULL */
if (!strstr("ide-disk", drive->driver_req))
goto failed;
if (!drive->present)
goto failed;

if (drive->media != ide_disk)
goto failed;

Expand Down
4 changes: 2 additions & 2 deletions drivers/ide/ide-floppy.c
Original file line number Diff line number Diff line change
Expand Up @@ -1390,10 +1390,10 @@ static int ide_floppy_probe(ide_drive_t *drive)

if (!strstr("ide-floppy", drive->driver_req))
goto failed;
if (!drive->present)
goto failed;

if (drive->media != ide_floppy)
goto failed;

if (!idefloppy_identify_device(drive, drive->id)) {
printk(KERN_ERR "ide-floppy: %s: not supported by this version"
" of ide-floppy\n", drive->name);
Expand Down
4 changes: 2 additions & 2 deletions drivers/ide/ide-tape.c
Original file line number Diff line number Diff line change
Expand Up @@ -2647,10 +2647,10 @@ static int ide_tape_probe(ide_drive_t *drive)

if (!strstr("ide-tape", drive->driver_req))
goto failed;
if (!drive->present)
goto failed;

if (drive->media != ide_tape)
goto failed;

if (!idetape_identify_device(drive)) {
printk(KERN_ERR "ide-tape: %s: not supported by this version of"
" the driver\n", drive->name);
Expand Down
1 change: 0 additions & 1 deletion drivers/scsi/ide-scsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,6 @@ static int ide_scsi_probe(ide_drive_t *drive)
return -ENODEV;

if (!strstr("ide-scsi", drive->driver_req) ||
!drive->present ||
drive->media == ide_disk ||
!(host = scsi_host_alloc(&idescsi_template,sizeof(idescsi_scsi_t))))
return -ENODEV;
Expand Down

0 comments on commit 2a92466

Please sign in to comment.