Commit 45e9aa1f authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI: Rename acpi_bus_get/put_acpi_device() 



Because acpi_bus_get_acpi_device() is completely analogous to
acpi_fetch_acpi_dev(), rename it to acpi_get_acpi_dev() and
add a kerneldoc comment to it.

Accordingly, rename acpi_bus_put_acpi_device() to acpi_put_acpi_dev()
and update all of the users of these two functions.

While at it, move the acpi_fetch_acpi_dev() header next to the
acpi_get_acpi_dev() header in the header file holding them.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarPunit Agrawal <punit.agrawal@bytedance.com>
parent 1c23f9e6

drivers/acpi/bus.c

+3 −3
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data) 
		break;

	}



	adev = acpi_bus_get_acpi_device(handle);

	adev = acpi_get_acpi_dev(handle);

	if (!adev)

		goto err;
@@ -524,14 +524,14 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data) 
	}



	if (!hotplug_event) {

		acpi_bus_put_acpi_device(adev);

		acpi_put_acpi_dev(adev);

		return;

	}



	if (ACPI_SUCCESS(acpi_hotplug_schedule(adev, type)))

		return;



	acpi_bus_put_acpi_device(adev);

	acpi_put_acpi_dev(adev);



 err:

	acpi_evaluate_ost(handle, type, ost_code, NULL);

drivers/acpi/device_pm.c

+2 −2
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ static void acpi_pm_notify_handler(acpi_handle handle, u32 val, void *not_used) 


	acpi_handle_debug(handle, "Wake notify\n");



	adev = acpi_bus_get_acpi_device(handle);

	adev = acpi_get_acpi_dev(handle);

	if (!adev)

		return;
@@ -515,7 +515,7 @@ static void acpi_pm_notify_handler(acpi_handle handle, u32 val, void *not_used) 


	mutex_unlock(&acpi_pm_notifier_lock);



	acpi_bus_put_acpi_device(adev);

	acpi_put_acpi_dev(adev);

}



/**

drivers/acpi/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -118,12 +118,12 @@ acpi_get_irq_source_fwhandle(const struct acpi_resource_source *source, 
	if (WARN_ON(ACPI_FAILURE(status)))

		return NULL;



	device = acpi_bus_get_acpi_device(handle);

	device = acpi_get_acpi_dev(handle);

	if (WARN_ON(!device))

		return NULL;



	result = &device->fwnode;

	acpi_bus_put_acpi_device(device);

	acpi_put_acpi_dev(device);

	return result;

}

drivers/acpi/scan.c

+16 −5
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ void acpi_device_hotplug(struct acpi_device *adev, u32 src) 
	acpi_evaluate_ost(adev->handle, src, ost_code, NULL);



 out:

	acpi_bus_put_acpi_device(adev);

	acpi_put_acpi_dev(adev);

	mutex_unlock(&acpi_scan_lock);

	unlock_device_hotplug();

}
@@ -599,11 +599,22 @@ static void get_acpi_device(void *dev) 
	acpi_dev_get(dev);

}



struct acpi_device *acpi_bus_get_acpi_device(acpi_handle handle)

/**

 * acpi_get_acpi_dev - Retrieve ACPI device object and reference count it.

 * @handle: ACPI handle associated with the requested ACPI device object.

 *

 * Return a pointer to the ACPI device object associated with @handle and bump

 * up that object's reference counter (under the ACPI Namespace lock), if

 * present, or return NULL otherwise.

 *

 * The ACPI device object reference acquired by this function needs to be

 * dropped via acpi_dev_put().

 */

struct acpi_device *acpi_get_acpi_dev(acpi_handle handle)

{

	return handle_to_device(handle, get_acpi_device);

}

EXPORT_SYMBOL_GPL(acpi_bus_get_acpi_device);

EXPORT_SYMBOL_GPL(acpi_get_acpi_dev);



static struct acpi_device_bus_id *acpi_device_bus_id_match(const char *dev_id)

{
@@ -2239,7 +2250,7 @@ static int acpi_dev_get_first_consumer_dev_cb(struct acpi_dep_data *dep, void *d 
{

	struct acpi_device *adev;



	adev = acpi_bus_get_acpi_device(dep->consumer);

	adev = acpi_get_acpi_dev(dep->consumer);

	if (adev) {

		*(struct acpi_device **)data = adev;

		return 1;
@@ -2292,7 +2303,7 @@ static bool acpi_scan_clear_dep_queue(struct acpi_device *adev) 


static int acpi_scan_clear_dep(struct acpi_dep_data *dep, void *data)

{

	struct acpi_device *adev = acpi_bus_get_acpi_device(dep->consumer);

	struct acpi_device *adev = acpi_get_acpi_dev(dep->consumer);



	if (adev) {

		adev->dep_unmet--;

drivers/hwmon/acpi_power_meter.c

+1 −1
Original line number Diff line number Diff line
@@ -598,7 +598,7 @@ static int read_domain_devices(struct acpi_power_meter_resource *resource) 
			continue;



		/* Create a symlink to domain objects */

		obj = acpi_bus_get_acpi_device(element->reference.handle);

		obj = acpi_get_acpi_dev(element->reference.handle);

		resource->domain_devices[i] = obj;

		if (!obj)

			continue;