Commit 70dcad34 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarDhruva Gole <d-gole@ti.com>
Reviewed-by: default avatarJonathan Cameron <jonathan.cameron@huawei.com>
[ rjw: Typo fix in the changelog ]
Link: https://patch.msgid.link/2040585.PYKUYFuaPT@rafael.j.wysocki


Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent ef8057b0

drivers/acpi/acpi_tad.c

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



	ACQUIRE(pm_runtime_active_try, pm)(dev);

	if (ACQUIRE_ERR(pm_runtime_active_try, &pm))

	PM_RUNTIME_ACQUIRE(dev, pm);

	if (PM_RUNTIME_ACQUIRE_ERR(&pm))

		return -ENXIO;



	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) 
{

	int ret;



	ACQUIRE(pm_runtime_active_try, pm)(dev);

	if (ACQUIRE_ERR(pm_runtime_active_try, &pm))

	PM_RUNTIME_ACQUIRE(dev, pm);

	if (PM_RUNTIME_ACQUIRE_ERR(&pm))

		return -ENXIO;



	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, 
	args[0].integer.value = timer_id;

	args[1].integer.value = value;



	ACQUIRE(pm_runtime_active_try, pm)(dev);

	if (ACQUIRE_ERR(pm_runtime_active_try, &pm))

	PM_RUNTIME_ACQUIRE(dev, pm);

	if (PM_RUNTIME_ACQUIRE_ERR(&pm))

		return -ENXIO;



	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, 


	args[0].integer.value = timer_id;



	ACQUIRE(pm_runtime_active_try, pm)(dev);

	if (ACQUIRE_ERR(pm_runtime_active_try, &pm))

	PM_RUNTIME_ACQUIRE(dev, pm);

	if (PM_RUNTIME_ACQUIRE_ERR(&pm))

		return -ENXIO;



	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) 


	args[0].integer.value = timer_id;



	ACQUIRE(pm_runtime_active_try, pm)(dev);

	if (ACQUIRE_ERR(pm_runtime_active_try, &pm))

	PM_RUNTIME_ACQUIRE(dev, pm);

	if (PM_RUNTIME_ACQUIRE_ERR(&pm))

		return -ENXIO;



	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) 


	args[0].integer.value = timer_id;



	ACQUIRE(pm_runtime_active_try, pm)(dev);

	if (ACQUIRE_ERR(pm_runtime_active_try, &pm))

	PM_RUNTIME_ACQUIRE(dev, pm);

	if (PM_RUNTIME_ACQUIRE_ERR(&pm))

		return -ENXIO;



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