Merge tag 'dt-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / drivers / acpi / power.c

diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index eba7785..b9863e2 100644 (file)
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -48,7 +48,6 @@ struct acpi_power_dependent_device {
 struct acpi_power_resource {
        struct acpi_device device;
        struct list_head list_node;
-       char *name;
        u32 system_level;
        u32 order;
        unsigned int ref_count;
@@ -70,6 +69,11 @@ static DEFINE_MUTEX(power_resource_list_lock);
                              Power Resource Management
    -------------------------------------------------------------------------- */
 
+static inline const char *resource_dev_name(struct acpi_power_resource *pr)
+{
+       return dev_name(&pr->device.dev);
+}
+
 static inline
 struct acpi_power_resource *to_power_resource(struct acpi_device *device)
 {
@@ -264,7 +268,8 @@ acpi_power_resource_add_dependent(struct acpi_power_resource *resource,
 
        dep->dev = dev;
        list_add_tail(&dep->node, &resource->dependents);
-       dev_dbg(dev, "added power dependency to [%s]\n", resource->name);
+       dev_dbg(dev, "added power dependency to [%s]\n",
+               resource_dev_name(resource));
 
 unlock:
        mutex_unlock(&resource->resource_lock);
@@ -283,7 +288,7 @@ acpi_power_resource_remove_dependent(struct acpi_power_resource *resource,
                        list_del(&dep->node);
                        kfree(dep);
                        dev_dbg(dev, "removed power dependency to [%s]\n",
-                               resource->name);
+                               resource_dev_name(resource));
                        break;
                }
        }
@@ -356,10 +361,11 @@ void acpi_device_power_remove_dependent(struct acpi_device *adev,
 
 static int __acpi_power_on(struct acpi_power_resource *resource)
 {
+       acpi_handle handle = resource->device.handle;
        struct acpi_power_dependent_device *dep;
        acpi_status status = AE_OK;
 
-       status = acpi_evaluate_object(resource->device.handle, "_ON", NULL, NULL);
+       status = acpi_evaluate_object(handle, "_ON", NULL, NULL);
        if (ACPI_FAILURE(status)) {
                resource->state = ACPI_POWER_RESOURCE_STATE_UNKNOWN;
                return -ENODEV;
@@ -367,7 +373,7 @@ static int __acpi_power_on(struct acpi_power_resource *resource)
 
        resource->state = ACPI_POWER_RESOURCE_STATE_ON;
 
-       pr_debug("Power resource [%s] turned on\n", resource->name);
+       acpi_handle_debug(handle, "Power resource turned on\n");
 
        /*
         * If there are other dependents on this power resource we need to
@@ -380,7 +386,7 @@ static int __acpi_power_on(struct acpi_power_resource *resource)
 
        list_for_each_entry(dep, &resource->dependents, node) {
                dev_dbg(dep->dev, "runtime resuming because [%s] turned on\n",
-                       resource->name);
+                       resource_dev_name(resource));
                pm_request_resume(dep->dev);
        }
 
@@ -392,7 +398,8 @@ static int acpi_power_on_unlocked(struct acpi_power_resource *resource)
        int result = 0;
 
        if (resource->ref_count++) {
-               pr_debug("Power resource [%s] already on\n", resource->name);
+               acpi_handle_debug(resource->device.handle,
+                                 "Power resource already on\n");
        } else {
                result = __acpi_power_on(resource);
                if (result)
@@ -413,10 +420,10 @@ static int acpi_power_on(struct acpi_power_resource *resource)
 
 static int __acpi_power_off(struct acpi_power_resource *resource)
 {
+       acpi_handle handle = resource->device.handle;
        acpi_status status;
 
-       status = acpi_evaluate_object(resource->device.handle, "_OFF",
-                                     NULL, NULL);
+       status = acpi_evaluate_object(handle, "_OFF", NULL, NULL);
        if (ACPI_FAILURE(status)) {
                resource->state = ACPI_POWER_RESOURCE_STATE_UNKNOWN;
                return -ENODEV;
@@ -424,7 +431,7 @@ static int __acpi_power_off(struct acpi_power_resource *resource)
 
        resource->state = ACPI_POWER_RESOURCE_STATE_OFF;
 
-       pr_debug("Power resource [%s] turned off\n", resource->name);
+       acpi_handle_debug(handle, "Power resource turned off\n");
 
        return 0;
 }
@@ -434,12 +441,14 @@ static int acpi_power_off_unlocked(struct acpi_power_resource *resource)
        int result = 0;
 
        if (!resource->ref_count) {
-               pr_debug("Power resource [%s] already off\n", resource->name);
+               acpi_handle_debug(resource->device.handle,
+                                 "Power resource already off\n");
                return 0;
        }
 
        if (--resource->ref_count) {
-               pr_debug("Power resource [%s] still in use\n", resource->name);
+               acpi_handle_debug(resource->device.handle,
+                                 "Power resource still in use\n");
        } else {
                result = __acpi_power_off(resource);
                if (result)
@@ -949,7 +958,6 @@ struct acpi_device *acpi_add_power_resource(acpi_handle handle)
        mutex_init(&resource->resource_lock);
        INIT_LIST_HEAD(&resource->list_node);
        INIT_LIST_HEAD(&resource->dependents);
-       resource->name = device->pnp.bus_id;
        strcpy(acpi_device_name(device), ACPI_POWER_DEVICE_NAME);
        strcpy(acpi_device_class(device), ACPI_POWER_CLASS);
        device->power.state = ACPI_STATE_UNKNOWN;
@@ -1004,7 +1012,7 @@ void acpi_resume_power_resources(void)
 
                if (state == ACPI_POWER_RESOURCE_STATE_OFF
                    && resource->ref_count) {
-                       dev_dbg(&resource->device.dev, "Turning ON\n");
+                       acpi_handle_debug(resource->device.handle, "Turning ON\n");
                        __acpi_power_on(resource);
                }
 
@@ -1034,7 +1042,7 @@ void acpi_turn_off_unused_power_resources(void)
                 */
                if (!resource->ref_count &&
                    resource->state != ACPI_POWER_RESOURCE_STATE_OFF) {
-                       dev_dbg(&resource->device.dev, "Turning OFF\n");
+                       acpi_handle_debug(resource->device.handle, "Turning OFF\n");
                        __acpi_power_off(resource);
                }