ACPI: TAD: Split three functions to untangle runtime PM handling

Move the core functionality of acpi_tad_get_real_time(),
acpi_tad_wake_set(), and acpi_tad_wake_read() into separate functions
called __acpi_tad_get_real_time(), __acpi_tad_wake_set(), and
__acpi_tad_wake_read(), respectively, which can be called from
code blocks following a single runtime resume of the device.

This will facilitate adding alarm support to the RTC class device
interface of the driver going forward.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://patch.msgid.link/23076728.EfDdHjke4D@rafael.j.wysocki

diff --git a/drivers/acpi/acpi_tad.c b/drivers/acpi/acpi_tad.c
index 8b43d883125ed415edc7459753126aef75c2b1e1..7b422904e45b4f35eba50b35f4e00f42a6c2a1b1 100644 (file)
--- a/drivers/acpi/acpi_tad.c
+++ b/drivers/acpi/acpi_tad.c
@@ -151,14 +151,10 @@ out_free:
        return ret;
 }
 
-static int acpi_tad_get_real_time(struct device *dev, struct acpi_tad_rt *rt)
+static int __acpi_tad_get_real_time(struct device *dev, struct acpi_tad_rt *rt)
 {
        int ret;
 
-       PM_RUNTIME_ACQUIRE(dev, pm);
-       if (PM_RUNTIME_ACQUIRE_ERR(&pm))
-               return -ENXIO;
-
        ret = acpi_tad_evaluate_grt(dev, rt);
        if (ret)
                return ret;
@@ -169,6 +165,15 @@ static int acpi_tad_get_real_time(struct device *dev, struct acpi_tad_rt *rt)
        return 0;
 }
 
+static int acpi_tad_get_real_time(struct device *dev, struct acpi_tad_rt *rt)
+{
+       PM_RUNTIME_ACQUIRE(dev, pm);
+       if (PM_RUNTIME_ACQUIRE_ERR(&pm))
+               return -ENXIO;
+
+       return __acpi_tad_get_real_time(dev, rt);
+}
+
 /* sysfs interface */
 
 static char *acpi_tad_rt_next_field(char *s, int *val)
@@ -268,8 +273,8 @@ static ssize_t time_show(struct device *dev, struct device_attribute *attr,
 
 static DEVICE_ATTR_RW(time);
 
-static int acpi_tad_wake_set(struct device *dev, char *method, u32 timer_id,
-                            u32 value)
+static int __acpi_tad_wake_set(struct device *dev, char *method, u32 timer_id,
+                              u32 value)
 {
        acpi_handle handle = ACPI_HANDLE(dev);
        union acpi_object args[] = {
@@ -286,10 +291,6 @@ 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_ACQUIRE(dev, pm);
-       if (PM_RUNTIME_ACQUIRE_ERR(&pm))
-               return -ENXIO;
-
        status = acpi_evaluate_integer(handle, method, &arg_list, &retval);
        if (ACPI_FAILURE(status) || retval)
                return -EIO;
@@ -297,6 +298,16 @@ static int acpi_tad_wake_set(struct device *dev, char *method, u32 timer_id,
        return 0;
 }
 
+static int acpi_tad_wake_set(struct device *dev, char *method, u32 timer_id,
+                            u32 value)
+{
+       PM_RUNTIME_ACQUIRE(dev, pm);
+       if (PM_RUNTIME_ACQUIRE_ERR(&pm))
+               return -ENXIO;
+
+       return __acpi_tad_wake_set(dev, method, timer_id, value);
+}
+
 static int acpi_tad_wake_write(struct device *dev, const char *buf, char *method,
                               u32 timer_id, const char *specval)
 {
@@ -317,8 +328,8 @@ static int acpi_tad_wake_write(struct device *dev, const char *buf, char *method
        return acpi_tad_wake_set(dev, method, timer_id, value);
 }
 
-static ssize_t acpi_tad_wake_read(struct device *dev, char *buf, char *method,
-                                 u32 timer_id, const char *specval)
+static int __acpi_tad_wake_read(struct device *dev, char *method, u32 timer_id,
+                               unsigned long long *retval)
 {
        acpi_handle handle = ACPI_HANDLE(dev);
        union acpi_object args[] = {
@@ -328,18 +339,30 @@ static ssize_t acpi_tad_wake_read(struct device *dev, char *buf, char *method,
                .pointer = args,
                .count = ARRAY_SIZE(args),
        };
-       unsigned long long retval;
        acpi_status status;
 
        args[0].integer.value = timer_id;
 
+       status = acpi_evaluate_integer(handle, method, &arg_list, retval);
+       if (ACPI_FAILURE(status))
+               return -EIO;
+
+       return 0;
+}
+
+static ssize_t acpi_tad_wake_read(struct device *dev, char *buf, char *method,
+                                 u32 timer_id, const char *specval)
+{
+       unsigned long long retval;
+       int ret;
+
        PM_RUNTIME_ACQUIRE(dev, pm);
        if (PM_RUNTIME_ACQUIRE_ERR(&pm))
                return -ENXIO;
 
-       status = acpi_evaluate_integer(handle, method, &arg_list, &retval);
-       if (ACPI_FAILURE(status))
-               return -EIO;
+       ret = __acpi_tad_wake_read(dev, method, timer_id, &retval);
+       if (ret)
+               return ret;
 
        if ((u32)retval == ACPI_TAD_WAKE_DISABLED)
                return sprintf(buf, "%s\n", specval);