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

Commit 594c8281 authored by Russell King's avatar Russell King Committed by Greg Kroah-Hartman
Browse files

[PATCH] Add bus_type probe, remove, shutdown methods. 



Add bus_type probe, remove and shutdown methods to replace the
corresponding methods in struct device_driver.  This matches
the way we handle the suspend/resume methods.

Since the bus methods override the device_driver methods, warn
if a device driver is registered whose methods will not be
called.

The long-term idea is to remove the device_driver methods entirely.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bd37e5a9

drivers/base/dd.c

+10 −2
Original line number Diff line number Diff line
@@ -78,7 +78,13 @@ int driver_probe_device(struct device_driver * drv, struct device * dev) 
	pr_debug("%s: Matched Device %s with Driver %s\n",

		 drv->bus->name, dev->bus_id, drv->name);

	dev->driver = drv;

	if (drv->probe) {

	if (dev->bus->probe) {

		ret = dev->bus->probe(dev);

		if (ret) {

			dev->driver = NULL;

			goto ProbeFailed;

		}

	} else if (drv->probe) {

		ret = drv->probe(dev);

		if (ret) {

			dev->driver = NULL;
@@ -203,7 +209,9 @@ static void __device_release_driver(struct device * dev) 
		sysfs_remove_link(&dev->kobj, "driver");

		klist_remove(&dev->knode_driver);



		if (drv->remove)

		if (dev->bus->remove)

			dev->bus->remove(dev);

		else if (drv->remove)

			drv->remove(dev);

		dev->driver = NULL;

		put_driver(drv);

drivers/base/driver.c

+5 −0
Original line number Diff line number Diff line
@@ -171,6 +171,11 @@ static void klist_devices_put(struct klist_node *n) 
 */

int driver_register(struct device_driver * drv)

{

	if ((drv->bus->probe && drv->probe) ||

	    (drv->bus->remove && drv->remove) ||

	    (drv->bus->shutdown && drv->shutdown)) {

		printk(KERN_WARNING "Driver '%s' needs updating - please use bus_type methods\n", drv->name);

	}

	klist_init(&drv->klist_devices, klist_devices_get, klist_devices_put);

	init_completion(&drv->unloaded);

	return bus_add_driver(drv);

drivers/base/power/shutdown.c

+4 −1
Original line number Diff line number Diff line
@@ -40,7 +40,10 @@ void device_shutdown(void) 
	down_write(&devices_subsys.rwsem);

	list_for_each_entry_reverse(dev, &devices_subsys.kset.list,

				kobj.entry) {

		if (dev->driver && dev->driver->shutdown) {

		if (dev->bus && dev->bus->shutdown) {

			dev_dbg(dev, "shutdown\n");

			dev->bus->shutdown(dev);

		} else if (dev->driver && dev->driver->shutdown) {

			dev_dbg(dev, "shutdown\n");

			dev->driver->shutdown(dev);

		}

include/linux/device.h

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ struct bus_type { 
	int		(*match)(struct device * dev, struct device_driver * drv);

	int		(*uevent)(struct device *dev, char **envp,

				  int num_envp, char *buffer, int buffer_size);

	int		(*probe)(struct device * dev);

	int		(*remove)(struct device * dev);

	void		(*shutdown)(struct device * dev);

	int		(*suspend)(struct device * dev, pm_message_t state);

	int		(*resume)(struct device * dev);

};