Driver core: coding style fixes
Fix up a number of coding style issues in the drivers/base/ directory that have annoyed me over the years. checkpatch.pl is now very happy. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
@@ -19,27 +19,26 @@
|
||||
#define to_dev(node) container_of(node, struct device, driver_list)
|
||||
|
||||
|
||||
static struct device * next_device(struct klist_iter * i)
|
||||
static struct device *next_device(struct klist_iter *i)
|
||||
{
|
||||
struct klist_node * n = klist_next(i);
|
||||
struct klist_node *n = klist_next(i);
|
||||
return n ? container_of(n, struct device, knode_driver) : NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
* 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.
|
||||
* 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.
|
||||
*
|
||||
* Iterate over the @drv's list of devices calling @fn for each one.
|
||||
* Iterate over the @drv's list of devices calling @fn for each one.
|
||||
*/
|
||||
|
||||
int driver_for_each_device(struct device_driver * drv, struct device * start,
|
||||
void * data, int (*fn)(struct device *, void *))
|
||||
int driver_for_each_device(struct device_driver *drv, struct device *start,
|
||||
void *data, int (*fn)(struct device *, void *))
|
||||
{
|
||||
struct klist_iter i;
|
||||
struct device * dev;
|
||||
struct device *dev;
|
||||
int error = 0;
|
||||
|
||||
if (!drv)
|
||||
@@ -52,10 +51,8 @@ int driver_for_each_device(struct device_driver * drv, struct device * start,
|
||||
klist_iter_exit(&i);
|
||||
return error;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(driver_for_each_device);
|
||||
|
||||
|
||||
/**
|
||||
* driver_find_device - device iterator for locating a particular device.
|
||||
* @drv: The device's driver
|
||||
@@ -71,9 +68,9 @@ EXPORT_SYMBOL_GPL(driver_for_each_device);
|
||||
* if it does. If the callback returns non-zero, this function will
|
||||
* return to the caller and not iterate over any more devices.
|
||||
*/
|
||||
struct device * driver_find_device(struct device_driver *drv,
|
||||
struct device * start, void * data,
|
||||
int (*match)(struct device *, void *))
|
||||
struct device *driver_find_device(struct device_driver *drv,
|
||||
struct device *start, void *data,
|
||||
int (*match)(struct device *dev, void *data))
|
||||
{
|
||||
struct klist_iter i;
|
||||
struct device *dev;
|
||||
@@ -92,12 +89,12 @@ struct device * driver_find_device(struct device_driver *drv,
|
||||
EXPORT_SYMBOL_GPL(driver_find_device);
|
||||
|
||||
/**
|
||||
* driver_create_file - create sysfs file for driver.
|
||||
* @drv: driver.
|
||||
* @attr: driver attribute descriptor.
|
||||
* driver_create_file - create sysfs file for driver.
|
||||
* @drv: driver.
|
||||
* @attr: driver attribute descriptor.
|
||||
*/
|
||||
|
||||
int driver_create_file(struct device_driver * drv, struct driver_attribute * attr)
|
||||
int driver_create_file(struct device_driver *drv,
|
||||
struct driver_attribute *attr)
|
||||
{
|
||||
int error;
|
||||
if (get_driver(drv)) {
|
||||
@@ -107,22 +104,22 @@ int driver_create_file(struct device_driver * drv, struct driver_attribute * att
|
||||
error = -EINVAL;
|
||||
return error;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(driver_create_file);
|
||||
|
||||
/**
|
||||
* driver_remove_file - remove sysfs file for driver.
|
||||
* @drv: driver.
|
||||
* @attr: driver attribute descriptor.
|
||||
* driver_remove_file - remove sysfs file for driver.
|
||||
* @drv: driver.
|
||||
* @attr: driver attribute descriptor.
|
||||
*/
|
||||
|
||||
void driver_remove_file(struct device_driver * drv, struct driver_attribute * attr)
|
||||
void driver_remove_file(struct device_driver *drv,
|
||||
struct driver_attribute *attr)
|
||||
{
|
||||
if (get_driver(drv)) {
|
||||
sysfs_remove_file(&drv->p->kobj, &attr->attr);
|
||||
put_driver(drv);
|
||||
}
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(driver_remove_file);
|
||||
|
||||
/**
|
||||
* driver_add_kobj - add a kobject below the specified driver
|
||||
@@ -149,10 +146,10 @@ int driver_add_kobj(struct device_driver *drv, struct kobject *kobj,
|
||||
EXPORT_SYMBOL_GPL(driver_add_kobj);
|
||||
|
||||
/**
|
||||
* get_driver - increment driver reference count.
|
||||
* @drv: driver.
|
||||
* get_driver - increment driver reference count.
|
||||
* @drv: driver.
|
||||
*/
|
||||
struct device_driver * get_driver(struct device_driver * drv)
|
||||
struct device_driver *get_driver(struct device_driver *drv)
|
||||
{
|
||||
if (drv) {
|
||||
struct driver_private *priv;
|
||||
@@ -164,16 +161,17 @@ struct device_driver * get_driver(struct device_driver * drv)
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(get_driver);
|
||||
|
||||
/**
|
||||
* put_driver - decrement driver's refcount.
|
||||
* @drv: driver.
|
||||
* put_driver - decrement driver's refcount.
|
||||
* @drv: driver.
|
||||
*/
|
||||
void put_driver(struct device_driver * drv)
|
||||
void put_driver(struct device_driver *drv)
|
||||
{
|
||||
kobject_put(&drv->p->kobj);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(put_driver);
|
||||
|
||||
static int driver_add_groups(struct device_driver *drv,
|
||||
struct attribute_group **groups)
|
||||
@@ -205,24 +203,23 @@ static void driver_remove_groups(struct device_driver *drv,
|
||||
sysfs_remove_group(&drv->p->kobj, groups[i]);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* driver_register - register driver with bus
|
||||
* @drv: driver to register
|
||||
* driver_register - register driver with bus
|
||||
* @drv: driver to register
|
||||
*
|
||||
* We pass off most of the work to the bus_add_driver() call,
|
||||
* since most of the things we have to do deal with the bus
|
||||
* structures.
|
||||
* We pass off most of the work to the bus_add_driver() call,
|
||||
* since most of the things we have to do deal with the bus
|
||||
* structures.
|
||||
*/
|
||||
int driver_register(struct device_driver * drv)
|
||||
int driver_register(struct device_driver *drv)
|
||||
{
|
||||
int ret;
|
||||
|
||||
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);
|
||||
}
|
||||
(drv->bus->shutdown && drv->shutdown))
|
||||
printk(KERN_WARNING "Driver '%s' needs updating - please use "
|
||||
"bus_type methods\n", drv->name);
|
||||
ret = bus_add_driver(drv);
|
||||
if (ret)
|
||||
return ret;
|
||||
@@ -231,29 +228,30 @@ int driver_register(struct device_driver * drv)
|
||||
bus_remove_driver(drv);
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(driver_register);
|
||||
|
||||
/**
|
||||
* driver_unregister - remove driver from system.
|
||||
* @drv: driver.
|
||||
* driver_unregister - remove driver from system.
|
||||
* @drv: driver.
|
||||
*
|
||||
* Again, we pass off most of the work to the bus-level call.
|
||||
* Again, we pass off most of the work to the bus-level call.
|
||||
*/
|
||||
|
||||
void driver_unregister(struct device_driver * drv)
|
||||
void driver_unregister(struct device_driver *drv)
|
||||
{
|
||||
driver_remove_groups(drv, drv->groups);
|
||||
bus_remove_driver(drv);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(driver_unregister);
|
||||
|
||||
/**
|
||||
* driver_find - locate driver on a bus by its name.
|
||||
* @name: name of the driver.
|
||||
* @bus: bus to scan for the driver.
|
||||
* driver_find - locate driver on a bus by its name.
|
||||
* @name: name of the driver.
|
||||
* @bus: bus to scan for the driver.
|
||||
*
|
||||
* Call kset_find_obj() to iterate over list of drivers on
|
||||
* a bus to find driver by name. Return driver if found.
|
||||
* Call kset_find_obj() to iterate over list of drivers on
|
||||
* a bus to find driver by name. Return driver if found.
|
||||
*
|
||||
* Note that kset_find_obj increments driver's reference count.
|
||||
* Note that kset_find_obj increments driver's reference count.
|
||||
*/
|
||||
struct device_driver *driver_find(const char *name, struct bus_type *bus)
|
||||
{
|
||||
@@ -266,12 +264,4 @@ struct device_driver *driver_find(const char *name, struct bus_type *bus)
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(driver_register);
|
||||
EXPORT_SYMBOL_GPL(driver_unregister);
|
||||
EXPORT_SYMBOL_GPL(get_driver);
|
||||
EXPORT_SYMBOL_GPL(put_driver);
|
||||
EXPORT_SYMBOL_GPL(driver_find);
|
||||
|
||||
EXPORT_SYMBOL_GPL(driver_create_file);
|
||||
EXPORT_SYMBOL_GPL(driver_remove_file);
|
||||
|
Reference in New Issue
Block a user