Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bb5ee01 authored by Kyle McMartin's avatar Kyle McMartin Committed by Guenter Roeck
Browse files

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: default avatarKyle McMartin <kyle@redhat.com>
Signed-off-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
parent 9fe789f8

drivers/hwmon/acpi_power_meter.c

+7 −8
Original line number Diff line number Diff line
@@ -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;

		}



		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)