ACPI: acpi_pad: Rename ACPI device from device to adev

Since transformation from ACPI driver to platform driver there are two
devices on which the driver operates - ACPI device and platform device.
For the sake of reader this calls for the distinction in their naming,
to avoid confusion. Rename device to adev, as corresponding
platform device is called pdev.

Signed-off-by: Michal Wilczynski <michal.wilczynski@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
index 3ede3019d8984e45396b0de738915a8f841740a3..32a2c006908b8fe1a32fc505f89ece2996b8e92a 100644 (file)
--- a/drivers/acpi/acpi_pad.c
+++ b/drivers/acpi/acpi_pad.c
@@ -398,13 +398,13 @@ static void acpi_pad_handle_notify(acpi_handle handle)
 static void acpi_pad_notify(acpi_handle handle, u32 event,
        void *data)
 {
-       struct acpi_device *device = data;
+       struct acpi_device *adev = data;
 
        switch (event) {
        case ACPI_PROCESSOR_AGGREGATOR_NOTIFY:
                acpi_pad_handle_notify(handle);
-               acpi_bus_generate_netlink_event(device->pnp.device_class,
-                       dev_name(&device->dev), event, 0);
+               acpi_bus_generate_netlink_event(adev->pnp.device_class,
+                       dev_name(&adev->dev), event, 0);
                break;
        default:
                pr_warn("Unsupported event [0x%x]\n", event);
@@ -414,14 +414,15 @@ static void acpi_pad_notify(acpi_handle handle, u32 event,
 
 static int acpi_pad_probe(struct platform_device *pdev)
 {
-       struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
+       struct acpi_device *adev = ACPI_COMPANION(&pdev->dev);
        acpi_status status;
 
-       strcpy(acpi_device_name(device), ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME);
-       strcpy(acpi_device_class(device), ACPI_PROCESSOR_AGGREGATOR_CLASS);
+       strcpy(acpi_device_name(adev), ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME);
+       strcpy(acpi_device_class(adev), ACPI_PROCESSOR_AGGREGATOR_CLASS);
+
+       status = acpi_install_notify_handler(adev->handle,
+               ACPI_DEVICE_NOTIFY, acpi_pad_notify, adev);
 
-       status = acpi_install_notify_handler(device->handle,
-               ACPI_DEVICE_NOTIFY, acpi_pad_notify, device);
        if (ACPI_FAILURE(status))
                return -ENODEV;
 
@@ -430,13 +431,13 @@ static int acpi_pad_probe(struct platform_device *pdev)
 
 static void acpi_pad_remove(struct platform_device *pdev)
 {
-       struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
+       struct acpi_device *adev = ACPI_COMPANION(&pdev->dev);
 
        mutex_lock(&isolated_cpus_lock);
        acpi_pad_idle_cpus(0);
        mutex_unlock(&isolated_cpus_lock);
 
-       acpi_remove_notify_handler(device->handle,
+       acpi_remove_notify_handler(adev->handle,
                ACPI_DEVICE_NOTIFY, acpi_pad_notify);
 }