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 <[email protected]>
---
drivers/acpi/ac.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 1dd4919be7ac..2618a7ccc11c 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -121,11 +121,11 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data)
{
struct device *dev = data;
struct acpi_ac *ac = dev_get_drvdata(dev);
- struct acpi_device *device = ACPI_COMPANION(dev);
+ struct acpi_device *adev = ACPI_COMPANION(dev);
switch (event) {
default:
- acpi_handle_debug(device->handle, "Unsupported event [0x%x]\n",
+ acpi_handle_debug(adev->handle, "Unsupported event [0x%x]\n",
event);
fallthrough;
case ACPI_AC_NOTIFY_STATUS:
@@ -142,11 +142,11 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data)
msleep(ac_sleep_before_get_state_ms);
acpi_ac_get_state(ac);
- acpi_bus_generate_netlink_event(device->pnp.device_class,
+ acpi_bus_generate_netlink_event(adev->pnp.device_class,
dev_name(dev),
event,
ac->state);
- acpi_notifier_call_chain(device, event, ac->state);
+ acpi_notifier_call_chain(adev, event, ac->state);
kobject_uevent(&ac->charger->dev.kobj, KOBJ_CHANGE);
}
}
@@ -205,7 +205,7 @@ static const struct dmi_system_id ac_dmi_table[] __initconst = {
static int acpi_ac_probe(struct platform_device *pdev)
{
- struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
+ struct acpi_device *adev = ACPI_COMPANION(&pdev->dev);
struct power_supply_config psy_cfg = {};
struct acpi_ac *ac;
int result;
@@ -214,9 +214,9 @@ static int acpi_ac_probe(struct platform_device *pdev)
if (!ac)
return -ENOMEM;
- ac->device = device;
- strcpy(acpi_device_name(device), ACPI_AC_DEVICE_NAME);
- strcpy(acpi_device_class(device), ACPI_AC_CLASS);
+ ac->device = adev;
+ strcpy(acpi_device_name(adev), ACPI_AC_DEVICE_NAME);
+ strcpy(acpi_device_class(adev), ACPI_AC_CLASS);
platform_set_drvdata(pdev, ac);
@@ -226,7 +226,7 @@ static int acpi_ac_probe(struct platform_device *pdev)
psy_cfg.drv_data = ac;
- ac->charger_desc.name = acpi_device_bid(device);
+ ac->charger_desc.name = acpi_device_bid(adev);
ac->charger_desc.type = POWER_SUPPLY_TYPE_MAINS;
ac->charger_desc.properties = ac_props;
ac->charger_desc.num_properties = ARRAY_SIZE(ac_props);
@@ -238,13 +238,13 @@ static int acpi_ac_probe(struct platform_device *pdev)
goto err_release_ac;
}
- pr_info("%s [%s] (%s-line)\n", acpi_device_name(device),
- acpi_device_bid(device), str_on_off(ac->state));
+ pr_info("%s [%s] (%s-line)\n", acpi_device_name(adev),
+ acpi_device_bid(adev), str_on_off(ac->state));
ac->battery_nb.notifier_call = acpi_ac_battery_notify;
register_acpi_notifier(&ac->battery_nb);
- result = acpi_dev_install_notify_handler(device, ACPI_ALL_NOTIFY,
+ result = acpi_dev_install_notify_handler(adev, ACPI_ALL_NOTIFY,
acpi_ac_notify, &pdev->dev);
if (result)
goto err_unregister;
--
2.41.0
On Wed, Oct 11, 2023 at 10:34 AM Michal Wilczynski
<[email protected]> wrote:
>
> 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 <[email protected]>
> ---
> drivers/acpi/ac.c | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
> index 1dd4919be7ac..2618a7ccc11c 100644
> --- a/drivers/acpi/ac.c
> +++ b/drivers/acpi/ac.c
> @@ -121,11 +121,11 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data)
> {
> struct device *dev = data;
> struct acpi_ac *ac = dev_get_drvdata(dev);
> - struct acpi_device *device = ACPI_COMPANION(dev);
> + struct acpi_device *adev = ACPI_COMPANION(dev);
>
> switch (event) {
> default:
> - acpi_handle_debug(device->handle, "Unsupported event [0x%x]\n",
> + acpi_handle_debug(adev->handle, "Unsupported event [0x%x]\n",
> event);
> fallthrough;
> case ACPI_AC_NOTIFY_STATUS:
> @@ -142,11 +142,11 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data)
> msleep(ac_sleep_before_get_state_ms);
>
> acpi_ac_get_state(ac);
> - acpi_bus_generate_netlink_event(device->pnp.device_class,
> + acpi_bus_generate_netlink_event(adev->pnp.device_class,
> dev_name(dev),
> event,
> ac->state);
> - acpi_notifier_call_chain(device, event, ac->state);
> + acpi_notifier_call_chain(adev, event, ac->state);
> kobject_uevent(&ac->charger->dev.kobj, KOBJ_CHANGE);
> }
> }
> @@ -205,7 +205,7 @@ static const struct dmi_system_id ac_dmi_table[] __initconst = {
>
> static int acpi_ac_probe(struct platform_device *pdev)
> {
> - struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
> + struct acpi_device *adev = ACPI_COMPANION(&pdev->dev);
> struct power_supply_config psy_cfg = {};
> struct acpi_ac *ac;
> int result;
> @@ -214,9 +214,9 @@ static int acpi_ac_probe(struct platform_device *pdev)
> if (!ac)
> return -ENOMEM;
>
> - ac->device = device;
> - strcpy(acpi_device_name(device), ACPI_AC_DEVICE_NAME);
> - strcpy(acpi_device_class(device), ACPI_AC_CLASS);
> + ac->device = adev;
> + strcpy(acpi_device_name(adev), ACPI_AC_DEVICE_NAME);
> + strcpy(acpi_device_class(adev), ACPI_AC_CLASS);
>
> platform_set_drvdata(pdev, ac);
>
> @@ -226,7 +226,7 @@ static int acpi_ac_probe(struct platform_device *pdev)
>
> psy_cfg.drv_data = ac;
>
> - ac->charger_desc.name = acpi_device_bid(device);
> + ac->charger_desc.name = acpi_device_bid(adev);
> ac->charger_desc.type = POWER_SUPPLY_TYPE_MAINS;
> ac->charger_desc.properties = ac_props;
> ac->charger_desc.num_properties = ARRAY_SIZE(ac_props);
> @@ -238,13 +238,13 @@ static int acpi_ac_probe(struct platform_device *pdev)
> goto err_release_ac;
> }
>
> - pr_info("%s [%s] (%s-line)\n", acpi_device_name(device),
> - acpi_device_bid(device), str_on_off(ac->state));
> + pr_info("%s [%s] (%s-line)\n", acpi_device_name(adev),
> + acpi_device_bid(adev), str_on_off(ac->state));
>
> ac->battery_nb.notifier_call = acpi_ac_battery_notify;
> register_acpi_notifier(&ac->battery_nb);
>
> - result = acpi_dev_install_notify_handler(device, ACPI_ALL_NOTIFY,
> + result = acpi_dev_install_notify_handler(adev, ACPI_ALL_NOTIFY,
> acpi_ac_notify, &pdev->dev);
> if (result)
> goto err_unregister;
> --
Rebased on top of current linux-next and applied as 6.7 material, thanks!