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

Commit 9f30ea95 authored by Sebastian Ott's avatar Sebastian Ott Committed by Greg Kroah-Hartman
Browse files

cio: remove {get,put}_driver 



Remove useless {get,put}_driver - the caller of the functions
has to ensure valid driver pointers.

Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
CC: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent cef9bc56

drivers/s390/cio/ccwgroup.c

+0 −2
Original line number Diff line number Diff line
@@ -580,7 +580,6 @@ void ccwgroup_driver_unregister(struct ccwgroup_driver *cdriver) 
	struct device *dev;



	/* We don't want ccwgroup devices to live longer than their driver. */

	get_driver(&cdriver->driver);

	while ((dev = driver_find_device(&cdriver->driver, NULL, NULL,

					 __ccwgroup_match_all))) {

		struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
@@ -592,7 +591,6 @@ void ccwgroup_driver_unregister(struct ccwgroup_driver *cdriver) 
		mutex_unlock(&gdev->reg_mutex);

		put_device(dev);

	}

	put_driver(&cdriver->driver);

	driver_unregister(&cdriver->driver);

}

EXPORT_SYMBOL(ccwgroup_driver_unregister);

drivers/s390/cio/device.c

+1 −7
Original line number Diff line number Diff line
@@ -1676,15 +1676,9 @@ struct ccw_device *get_ccwdev_by_busid(struct ccw_driver *cdrv, 
				       const char *bus_id)

{

	struct device *dev;

	struct device_driver *drv;



	drv = get_driver(&cdrv->driver);

	if (!drv)

		return NULL;



	dev = driver_find_device(drv, NULL, (void *)bus_id,

	dev = driver_find_device(&cdrv->driver, NULL, (void *)bus_id,

				 __ccwdev_check_busid);

	put_driver(drv);



	return dev ? to_ccwdev(dev) : NULL;

}