ACPI: TAD: Improve runtime PM using guard macros

Use guard pm_runtime_active_try to simplify runtime PM cleanup and
implement runtime resume error handling in multiple places.

Also use guard pm_runtime_noresume to simplify acpi_tad_remove().

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com>
Link: https://patch.msgid.link/13881356.uLZWGnKmhe@rafael.j.wysocki

diff --git a/drivers/acpi/acpi_tad.c b/drivers/acpi/acpi_tad.c
index 651a2b9958447ddd5a827e2c8e09c40dea2cdd1e..c9487c5bb7b39c6d28e5e66519a8dbc4d3e1b8ff 100644 (file)
--- a/drivers/acpi/acpi_tad.c
+++ b/drivers/acpi/acpi_tad.c
@@ -90,19 +90,18 @@ static int acpi_tad_set_real_time(struct device *dev, struct acpi_tad_rt *rt)
        args[0].buffer.pointer = (u8 *)rt;
        args[0].buffer.length = sizeof(*rt);
 
-       pm_runtime_get_sync(dev);
+       ACQUIRE(pm_runtime_active_try, pm)(dev);
+       if (ACQUIRE_ERR(pm_runtime_active_try, &pm))
+               return -ENXIO;
 
        status = acpi_evaluate_integer(handle, "_SRT", &arg_list, &retval);
-
-       pm_runtime_put_sync(dev);
-
        if (ACPI_FAILURE(status) || retval)
                return -EIO;
 
        return 0;
 }
 
-static int acpi_tad_get_real_time(struct device *dev, struct acpi_tad_rt *rt)
+static int acpi_tad_evaluate_grt(struct device *dev, struct acpi_tad_rt *rt)
 {
        acpi_handle handle = ACPI_HANDLE(dev);
        struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER };
@@ -111,12 +110,7 @@ static int acpi_tad_get_real_time(struct device *dev, struct acpi_tad_rt *rt)
        acpi_status status;
        int ret = -EIO;
 
-       pm_runtime_get_sync(dev);
-
        status = acpi_evaluate_object(handle, "_GRT", NULL, &output);
-
-       pm_runtime_put_sync(dev);
-
        if (ACPI_FAILURE(status))
                goto out_free;
 
@@ -139,6 +133,21 @@ out_free:
        return ret;
 }
 
+static int acpi_tad_get_real_time(struct device *dev, struct acpi_tad_rt *rt)
+{
+       int ret;
+
+       ACQUIRE(pm_runtime_active_try, pm)(dev);
+       if (ACQUIRE_ERR(pm_runtime_active_try, &pm))
+               return -ENXIO;
+
+       ret = acpi_tad_evaluate_grt(dev, rt);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
 static char *acpi_tad_rt_next_field(char *s, int *val)
 {
        char *p;
@@ -266,12 +275,11 @@ static int acpi_tad_wake_set(struct device *dev, char *method, u32 timer_id,
        args[0].integer.value = timer_id;
        args[1].integer.value = value;
 
-       pm_runtime_get_sync(dev);
+       ACQUIRE(pm_runtime_active_try, pm)(dev);
+       if (ACQUIRE_ERR(pm_runtime_active_try, &pm))
+               return -ENXIO;
 
        status = acpi_evaluate_integer(handle, method, &arg_list, &retval);
-
-       pm_runtime_put_sync(dev);
-
        if (ACPI_FAILURE(status) || retval)
                return -EIO;
 
@@ -314,12 +322,11 @@ static ssize_t acpi_tad_wake_read(struct device *dev, char *buf, char *method,
 
        args[0].integer.value = timer_id;
 
-       pm_runtime_get_sync(dev);
+       ACQUIRE(pm_runtime_active_try, pm)(dev);
+       if (ACQUIRE_ERR(pm_runtime_active_try, &pm))
+               return -ENXIO;
 
        status = acpi_evaluate_integer(handle, method, &arg_list, &retval);
-
-       pm_runtime_put_sync(dev);
-
        if (ACPI_FAILURE(status))
                return -EIO;
 
@@ -370,12 +377,11 @@ static int acpi_tad_clear_status(struct device *dev, u32 timer_id)
 
        args[0].integer.value = timer_id;
 
-       pm_runtime_get_sync(dev);
+       ACQUIRE(pm_runtime_active_try, pm)(dev);
+       if (ACQUIRE_ERR(pm_runtime_active_try, &pm))
+               return -ENXIO;
 
        status = acpi_evaluate_integer(handle, "_CWS", &arg_list, &retval);
-
-       pm_runtime_put_sync(dev);
-
        if (ACPI_FAILURE(status) || retval)
                return -EIO;
 
@@ -411,12 +417,11 @@ static ssize_t acpi_tad_status_read(struct device *dev, char *buf, u32 timer_id)
 
        args[0].integer.value = timer_id;
 
-       pm_runtime_get_sync(dev);
+       ACQUIRE(pm_runtime_active_try, pm)(dev);
+       if (ACQUIRE_ERR(pm_runtime_active_try, &pm))
+               return -ENXIO;
 
        status = acpi_evaluate_integer(handle, "_GWS", &arg_list, &retval);
-
-       pm_runtime_put_sync(dev);
-
        if (ACPI_FAILURE(status))
                return -EIO;
 
@@ -571,16 +576,15 @@ static void acpi_tad_remove(struct platform_device *pdev)
 
        sysfs_remove_group(&dev->kobj, &acpi_tad_attr_group);
 
-       pm_runtime_get_noresume(dev);
-
-       acpi_tad_disable_timer(dev, ACPI_TAD_AC_TIMER);
-       acpi_tad_clear_status(dev, ACPI_TAD_AC_TIMER);
-       if (dd->capabilities & ACPI_TAD_DC_WAKE) {
-               acpi_tad_disable_timer(dev, ACPI_TAD_DC_TIMER);
-               acpi_tad_clear_status(dev, ACPI_TAD_DC_TIMER);
+       scoped_guard(pm_runtime_noresume, dev) {
+               acpi_tad_disable_timer(dev, ACPI_TAD_AC_TIMER);
+               acpi_tad_clear_status(dev, ACPI_TAD_AC_TIMER);
+               if (dd->capabilities & ACPI_TAD_DC_WAKE) {
+                       acpi_tad_disable_timer(dev, ACPI_TAD_DC_TIMER);
+                       acpi_tad_clear_status(dev, ACPI_TAD_DC_TIMER);
+               }
        }
 
-       pm_runtime_put_noidle(dev);
        pm_runtime_suspend(dev);
        pm_runtime_disable(dev);
        acpi_remove_cmos_rtc_space_handler(handle);