diff options
| -rw-r--r-- | drivers/hwmon/acpi_power_meter.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c index 1e3fab5f7946..49e57c20ef70 100644 --- a/drivers/hwmon/acpi_power_meter.c +++ b/drivers/hwmon/acpi_power_meter.c @@ -816,14 +816,9 @@ end: /* Handle ACPI event notifications */ static void acpi_power_meter_notify(struct acpi_device *device, u32 event) { - struct acpi_power_meter_resource *resource; + struct acpi_power_meter_resource *resource = acpi_driver_data(device); int res; - if (!device || !acpi_driver_data(device)) - return; - - resource = acpi_driver_data(device); - guard(mutex)(&acpi_notify_lock); switch (event) { @@ -956,12 +951,8 @@ exit: static void acpi_power_meter_remove(struct acpi_device *device) { - struct acpi_power_meter_resource *resource; + struct acpi_power_meter_resource *resource = acpi_driver_data(device); - if (!device || !acpi_driver_data(device)) - return; - - resource = acpi_driver_data(device); if (!IS_ERR(resource->hwmon_dev)) hwmon_device_unregister(resource->hwmon_dev); @@ -975,12 +966,7 @@ static int acpi_power_meter_resume(struct device *dev) { struct acpi_power_meter_resource *resource; - if (!dev) - return -EINVAL; - resource = acpi_driver_data(to_acpi_device(dev)); - if (!resource) - return -EINVAL; free_capabilities(resource); read_capabilities(resource); |