summaryrefslogtreecommitdiff
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorKyle McMartin <kyle@mcmartin.ca>2012-04-02 22:19:04 +0400
committerGuenter Roeck <guenter.roeck@ericsson.com>2012-05-21 06:41:49 +0400
commit7bb5ee0169b80d40aa7d4854c07f1c2a90efc5b8 (patch)
tree4bf1bc45ca14c228515ab3dc8e25bf04e8d5b909 /drivers/hwmon
parent9fe789f88ae5488d8b8af1c4c962e619ed05bb2e (diff)
downloadlinux-7bb5ee0169b80d40aa7d4854c07f1c2a90efc5b8.tar.xz
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>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/acpi_power_meter.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
index c3f3058a7099..34ad5a27a7e9 100644
--- 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)