projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
[powerpc.git]
/
drivers
/
base
/
driver.c
diff --git
a/drivers/base/driver.c
b/drivers/base/driver.c
index
ef3fe51
..
b400314
100644
(file)
--- a/
drivers/base/driver.c
+++ b/
drivers/base/driver.c
@@
-28,6
+28,7
@@
static struct device * next_device(struct klist_iter * i)
/**
* driver_for_each_device - Iterator for devices bound to a driver.
* @drv: Driver we're iterating.
/**
* driver_for_each_device - Iterator for devices bound to a driver.
* @drv: Driver we're iterating.
+ * @start: Device to begin with
* @data: Data to pass to the callback.
* @fn: Function to call for each device.
*
* @data: Data to pass to the callback.
* @fn: Function to call for each device.
*
@@
-57,7
+58,7
@@
EXPORT_SYMBOL_GPL(driver_for_each_device);
/**
* driver_find_device - device iterator for locating a particular device.
/**
* driver_find_device - device iterator for locating a particular device.
- * @dr
iver
: The device's driver
+ * @dr
v
: The device's driver
* @start: Device to begin with
* @data: Data to pass to match function
* @match: Callback function to check device
* @start: Device to begin with
* @data: Data to pass to match function
* @match: Callback function to check device
@@
-170,6
+171,11
@@
static void klist_devices_put(struct klist_node *n)
*/
int driver_register(struct device_driver * drv)
{
*/
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);
klist_init(&drv->klist_devices, klist_devices_get, klist_devices_put);
init_completion(&drv->unloaded);
return bus_add_driver(drv);