Skip to content

Commit 70dcad3

Browse files
committed
ACPI: TAD: Use PM_RUNTIME_ACQUIRE()/PM_RUNTIME_ACQUIRE_ERR()
Use new PM_RUNTIME_ACQUIRE() and PM_RUNTIME_ACQUIRE_ERR() wrapper macros to make the code look more straightforward. No intentional functional impact. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Dhruva Gole <d-gole@ti.com> Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com> [ rjw: Typo fix in the changelog ] Link: https://patch.msgid.link/2040585.PYKUYFuaPT@rafael.j.wysocki Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent ef8057b commit 70dcad3

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

drivers/acpi/acpi_tad.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ static int acpi_tad_set_real_time(struct device *dev, struct acpi_tad_rt *rt)
9090
args[0].buffer.pointer = (u8 *)rt;
9191
args[0].buffer.length = sizeof(*rt);
9292

93-
ACQUIRE(pm_runtime_active_try, pm)(dev);
94-
if (ACQUIRE_ERR(pm_runtime_active_try, &pm))
93+
PM_RUNTIME_ACQUIRE(dev, pm);
94+
if (PM_RUNTIME_ACQUIRE_ERR(&pm))
9595
return -ENXIO;
9696

9797
status = acpi_evaluate_integer(handle, "_SRT", &arg_list, &retval);
@@ -137,8 +137,8 @@ static int acpi_tad_get_real_time(struct device *dev, struct acpi_tad_rt *rt)
137137
{
138138
int ret;
139139

140-
ACQUIRE(pm_runtime_active_try, pm)(dev);
141-
if (ACQUIRE_ERR(pm_runtime_active_try, &pm))
140+
PM_RUNTIME_ACQUIRE(dev, pm);
141+
if (PM_RUNTIME_ACQUIRE_ERR(&pm))
142142
return -ENXIO;
143143

144144
ret = acpi_tad_evaluate_grt(dev, rt);
@@ -275,8 +275,8 @@ static int acpi_tad_wake_set(struct device *dev, char *method, u32 timer_id,
275275
args[0].integer.value = timer_id;
276276
args[1].integer.value = value;
277277

278-
ACQUIRE(pm_runtime_active_try, pm)(dev);
279-
if (ACQUIRE_ERR(pm_runtime_active_try, &pm))
278+
PM_RUNTIME_ACQUIRE(dev, pm);
279+
if (PM_RUNTIME_ACQUIRE_ERR(&pm))
280280
return -ENXIO;
281281

282282
status = acpi_evaluate_integer(handle, method, &arg_list, &retval);
@@ -322,8 +322,8 @@ static ssize_t acpi_tad_wake_read(struct device *dev, char *buf, char *method,
322322

323323
args[0].integer.value = timer_id;
324324

325-
ACQUIRE(pm_runtime_active_try, pm)(dev);
326-
if (ACQUIRE_ERR(pm_runtime_active_try, &pm))
325+
PM_RUNTIME_ACQUIRE(dev, pm);
326+
if (PM_RUNTIME_ACQUIRE_ERR(&pm))
327327
return -ENXIO;
328328

329329
status = acpi_evaluate_integer(handle, method, &arg_list, &retval);
@@ -377,8 +377,8 @@ static int acpi_tad_clear_status(struct device *dev, u32 timer_id)
377377

378378
args[0].integer.value = timer_id;
379379

380-
ACQUIRE(pm_runtime_active_try, pm)(dev);
381-
if (ACQUIRE_ERR(pm_runtime_active_try, &pm))
380+
PM_RUNTIME_ACQUIRE(dev, pm);
381+
if (PM_RUNTIME_ACQUIRE_ERR(&pm))
382382
return -ENXIO;
383383

384384
status = acpi_evaluate_integer(handle, "_CWS", &arg_list, &retval);
@@ -417,8 +417,8 @@ static ssize_t acpi_tad_status_read(struct device *dev, char *buf, u32 timer_id)
417417

418418
args[0].integer.value = timer_id;
419419

420-
ACQUIRE(pm_runtime_active_try, pm)(dev);
421-
if (ACQUIRE_ERR(pm_runtime_active_try, &pm))
420+
PM_RUNTIME_ACQUIRE(dev, pm);
421+
if (PM_RUNTIME_ACQUIRE_ERR(&pm))
422422
return -ENXIO;
423423

424424
status = acpi_evaluate_integer(handle, "_GWS", &arg_list, &retval);

0 commit comments

Comments
 (0)