Commit 2a924662 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 3cd5f1ea

drivers/ide/ide-cd.c

+2 −2
Original line number Diff line number Diff line
@@ -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)) {

drivers/ide/ide-disk.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

drivers/ide/ide-floppy.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/ide/ide-tape.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/scsi/ide-scsi.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE