acpi_power_meter: clean up code around setup_attrs

We don't need to duplicate if (res) checks if we're always running
one or the other.

Signed-off-by: Kyle McMartin <kyle@redhat.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>

diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
index c3f3058a70994b01a7e1c1dfca0eb0ae80846cba..34ad5a27a7e9fcd68b7597f799a99387f421c835 100644 (file)
--- a/drivers/hwmon/acpi_power_meter.c
+++ b/drivers/hwmon/acpi_power_meter.c
@@ -697,21 +697,20 @@ static int setup_attrs(struct acpi_power_meter_resource *resource)
                        goto skip_unsafe_cap;
                }
 
-               if (resource->caps.configurable_cap) {
+               if (resource->caps.configurable_cap)
                        res = register_attrs(resource, rw_cap_attrs);
-                       if (res)
-                               goto error;
-               } else {
+               else
                        res = register_attrs(resource, ro_cap_attrs);
-                       if (res)
-                               goto error;
-               }
+
+               if (res)
+                       goto error;
+
                res = register_attrs(resource, misc_cap_attrs);
                if (res)
                        goto error;
        }
-skip_unsafe_cap:
 
+skip_unsafe_cap:
        if (resource->caps.flags & POWER_METER_CAN_TRIP) {
                res = register_attrs(resource, trip_attrs);
                if (res)