From 7bb5ee0169b80d40aa7d4854c07f1c2a90efc5b8 Mon Sep 17 00:00:00 2001 From: Kyle McMartin Date: Mon, 2 Apr 2012 14:19:04 -0400 Subject: [PATCH] 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 Signed-off-by: Guenter Roeck --- drivers/hwmon/acpi_power_meter.c | 15 +++++++-------- 1 file 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) -- 2.34.1