Driver core: coding style cleanup

This converts code of the form

	if ((error = some_func()))
		goto fixup;
to
	error = some_func();
	if (error)
		goto fixup;

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 10 insertions, 5 deletions

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 7ff5aafe216..f299e0d6abc 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -622,7 +622,8 @@ int bus_add_driver(struct device_driver *drv)
         if (error)
                 goto out_put_bus;
         drv->kobj.kset = &bus->drivers;
-        if ((error = kobject_register(&drv->kobj)))
+        error = kobject_register(&drv->kobj);
+        if (error)
                 goto out_put_bus;
 
         if (drv->bus->drivers_autoprobe) {
@@ -772,7 +773,8 @@ static int bus_add_attrs(struct bus_type * bus)
 
         if (bus->bus_attrs) {
                 for (i = 0; attr_name(bus->bus_attrs[i]); i++) {
-                        if ((error = bus_create_file(bus,&bus->bus_attrs[i])))
+                        error = bus_create_file(bus,&bus->bus_attrs[i]);
+                        if (error)
                                 goto Err;
                 }
         }
diff --git a/drivers/base/core.c b/drivers/base/core.c
index dd40d78a023..cff4fbfbb05 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -733,11 +733,14 @@ int device_add(struct device *dev)
                 }
         }
 
-        if ((error = device_add_attrs(dev)))
+        error = device_add_attrs(dev);
+        if (error)
                 goto AttrsError;
-        if ((error = device_pm_add(dev)))
+        error = device_pm_add(dev);
+        if (error)
                 goto PMError;
-        if ((error = bus_add_device(dev)))
+        error = bus_add_device(dev);
+        if (error)
                 goto BusError;
         kobject_uevent(&dev->kobj, KOBJ_ADD);
         bus_attach_device(dev);