Commit e03c5941 authored by Jan Höppner's avatar Jan Höppner Committed by Jens Axboe
Browse files

s390/dasd: Remove unused parameter from dasd_generic_probe() 



The discipline argument in dasd_generic_probe() isn't used and there is
no history how it was used in the past. Remove it.

Signed-off-by: default avatarJan Höppner <hoeppner@linux.ibm.com>
Signed-off-by: default avatarStefan Haberland <sth@linux.ibm.com>
Reviewed-by: default avatarStefan Haberland <sth@linux.ibm.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 32ef9388

drivers/s390/block/dasd.c

+1 −2
Original line number Diff line number Diff line
@@ -3466,8 +3466,7 @@ static void dasd_generic_auto_online(void *data, async_cookie_t cookie) 
 * Initial attempt at a probe function. this can be simplified once

 * the other detection code is gone.

 */

int dasd_generic_probe(struct ccw_device *cdev,

		       struct dasd_discipline *discipline)

int dasd_generic_probe(struct ccw_device *cdev)

{

	int ret;

drivers/s390/block/dasd_eckd.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ dasd_eckd_probe (struct ccw_device *cdev) 
				"ccw-device options");

		return ret;

	}

	ret = dasd_generic_probe(cdev, &dasd_eckd_discipline);

	ret = dasd_generic_probe(cdev);

	return ret;

}

drivers/s390/block/dasd_fba.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static struct ccw_driver dasd_fba_driver; /* see below */ 
static int

dasd_fba_probe(struct ccw_device *cdev)

{

	return dasd_generic_probe(cdev, &dasd_fba_discipline);

	return dasd_generic_probe(cdev);

}



static int

drivers/s390/block/dasd_int.h

+1 −1
Original line number Diff line number Diff line
@@ -774,7 +774,7 @@ void dasd_block_set_timer(struct dasd_block *, int); 
void dasd_block_clear_timer(struct dasd_block *);

int  dasd_cancel_req(struct dasd_ccw_req *);

int dasd_flush_device_queue(struct dasd_device *);

int dasd_generic_probe (struct ccw_device *, struct dasd_discipline *);

int dasd_generic_probe(struct ccw_device *);

void dasd_generic_free_discipline(struct dasd_device *);

void dasd_generic_remove (struct ccw_device *cdev);

int dasd_generic_set_online(struct ccw_device *, struct dasd_discipline *);