drivers/base/bus: remove indentation level
PATCH 1/1 drivers/base/bus: remove indentation level
Before potentially fixing up these functions, this cosmetic change reduces the indentation level to make the code easier to read and maintain.
No functional changes at all.
Signed-off-by Jeff Garzik <[email protected]>
---
drivers/base/bus.c | 77 +++++++++++++++++++++++++++-------------------------- 1 files changed, 40 insertions(+), 37 deletions(-)
drivers/base/bus.c +40 -37
@@ -505,34 +505,36 @@ int bus_add_driver(struct device_driverstruct bus_type * bus =get_bus (drv->bus);int error =0 ; -if (bus) { -pr_debug ("bus %s: add driver %s\n" , bus->name, drv->name); - error =kobject_set_name (&drv->kobj,"%s" , drv->name); -if (error) - goto out_put_bus; - drv->kobj.kset = &bus->drivers; -if ((error =kobject_register (&drv->kobj))) - goto out_put_bus; - - error =driver_attach (drv); -if (error) - goto out_unregister; -klist_add_tail (&drv->knode_bus, &bus->klist_drivers); -module_add_driver (drv->owner, drv); - - error =driver_add_attrs (bus, drv); -if (error) { -/* How the hell do we get out of this pickle? Give up */ -printk (KERN_ERR "%s: driver_add_attrs(%s) failed\n" , - __FUNCTION__, drv->name); - } - error =add_bind_files (drv); -if (error) { -/* Ditto */ -printk (KERN_ERR "%s: add_bind_files(%s) failed\n" , - __FUNCTION__, drv->name); - } +if (!bus) +return 0 ; + +pr_debug ("bus %s: add driver %s\n" , bus->name, drv->name); + error =kobject_set_name (&drv->kobj,"%s" , drv->name); +if (error) + goto out_put_bus; + drv->kobj.kset = &bus->drivers; +if ((error =kobject_register (&drv->kobj))) + goto out_put_bus; + + error =driver_attach (drv); +if (error) + goto out_unregister; +klist_add_tail (&drv->knode_bus, &bus->klist_drivers); +module_add_driver (drv->owner, drv); + + error =driver_add_attrs (bus, drv); +if (error) { +/* How the hell do we get out of this pickle? Give up */ +printk (KERN_ERR "%s: driver_add_attrs(%s) failed\n" , + __FUNCTION__, drv->name); + } + error =add_bind_files (drv); +if (error) { +/* Ditto */ +printk (KERN_ERR "%s: add_bind_files(%s) failed\n" , + __FUNCTION__, drv->name); } +return error; out_unregister:kobject_unregister (&drv->kobj);
@@ -552,16 +554,17 @@ out_put_bus:void bus_remove_driver (struct device_driver * drv) { -if (drv->bus) { -remove_bind_files (drv); -driver_remove_attrs (drv->bus, drv); -klist_remove (&drv->knode_bus); -pr_debug ("bus %s: remove driver %s\n" , drv->bus->name, drv->name); -driver_detach (drv); -module_remove_driver (drv); -kobject_unregister (&drv->kobj); -put_bus (drv->bus); - } +if (!drv->bus) +return ; + +remove_bind_files (drv); +driver_remove_attrs (drv->bus, drv); +klist_remove (&drv->knode_bus); +pr_debug ("bus %s: remove driver %s\n" , drv->bus->name, drv->name); +driver_detach (drv); +module_remove_driver (drv); +kobject_unregister (&drv->kobj); +put_bus (drv->bus); }