From: Cornelia Huck 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 Cc: Greg KH Signed-off-by: Andrew Morton --- drivers/base/bus.c | 6 ++++-- drivers/base/core.c | 12 ++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff -puN drivers/base/bus.c~driver-core-coding-style-cleanup drivers/base/bus.c --- a/drivers/base/bus.c~driver-core-coding-style-cleanup +++ a/drivers/base/bus.c @@ -620,7 +620,8 @@ int bus_add_driver(struct device_driver 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) { @@ -770,7 +771,8 @@ static int bus_add_attrs(struct bus_type 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 -puN drivers/base/core.c~driver-core-coding-style-cleanup drivers/base/core.c --- a/drivers/base/core.c~driver-core-coding-style-cleanup +++ a/drivers/base/core.c @@ -770,13 +770,17 @@ int device_add(struct device *dev) if (error) goto ueventattrError; } - if ((error = device_add_class_symlinks(dev))) + error = device_add_class_symlinks(dev); + if (error) goto SymlinkError; - 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); _