mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-09-21 20:22:13 +08:00
ACPI: bus: Add context argument to acpi_dev_install_notify_handler()
Add void *context arrgument to the list of arguments of acpi_dev_install_notify_handler() and modify it to pass that argument as context to acpi_install_notify_handler() instead of its first argument which is problematic in general (for example, if platform drivers used it, they would rather get struct platform_device pointers or pointers to their private data from the context arguments of their notify handlers). Make all of the current callers of acpi_dev_install_notify_handler() take this change into account so as to avoid altering the general functionality. Co-developed-by: Michal Wilczynski <michal.wilczynski@intel.com> Signed-off-by: Michal Wilczynski <michal.wilczynski@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
5f3c10ac34
commit
470508f63a
@ -257,7 +257,7 @@ static int acpi_ac_add(struct acpi_device *device)
|
|||||||
register_acpi_notifier(&ac->battery_nb);
|
register_acpi_notifier(&ac->battery_nb);
|
||||||
|
|
||||||
result = acpi_dev_install_notify_handler(device, ACPI_ALL_NOTIFY,
|
result = acpi_dev_install_notify_handler(device, ACPI_ALL_NOTIFY,
|
||||||
acpi_ac_notify);
|
acpi_ac_notify, device);
|
||||||
if (result)
|
if (result)
|
||||||
goto err_unregister;
|
goto err_unregister;
|
||||||
|
|
||||||
|
@ -2062,7 +2062,7 @@ static int acpi_video_bus_add(struct acpi_device *device)
|
|||||||
goto err_del;
|
goto err_del;
|
||||||
|
|
||||||
error = acpi_dev_install_notify_handler(device, ACPI_DEVICE_NOTIFY,
|
error = acpi_dev_install_notify_handler(device, ACPI_DEVICE_NOTIFY,
|
||||||
acpi_video_bus_notify);
|
acpi_video_bus_notify, device);
|
||||||
if (error)
|
if (error)
|
||||||
goto err_remove;
|
goto err_remove;
|
||||||
|
|
||||||
|
@ -1214,7 +1214,7 @@ static int acpi_battery_add(struct acpi_device *device)
|
|||||||
device_init_wakeup(&device->dev, 1);
|
device_init_wakeup(&device->dev, 1);
|
||||||
|
|
||||||
result = acpi_dev_install_notify_handler(device, ACPI_ALL_NOTIFY,
|
result = acpi_dev_install_notify_handler(device, ACPI_ALL_NOTIFY,
|
||||||
acpi_battery_notify);
|
acpi_battery_notify, device);
|
||||||
if (result)
|
if (result)
|
||||||
goto fail_pm;
|
goto fail_pm;
|
||||||
|
|
||||||
|
@ -556,12 +556,12 @@ static void acpi_device_remove_notify_handler(struct acpi_device *device,
|
|||||||
|
|
||||||
int acpi_dev_install_notify_handler(struct acpi_device *adev,
|
int acpi_dev_install_notify_handler(struct acpi_device *adev,
|
||||||
u32 handler_type,
|
u32 handler_type,
|
||||||
acpi_notify_handler handler)
|
acpi_notify_handler handler, void *context)
|
||||||
{
|
{
|
||||||
acpi_status status;
|
acpi_status status;
|
||||||
|
|
||||||
status = acpi_install_notify_handler(adev->handle, handler_type,
|
status = acpi_install_notify_handler(adev->handle, handler_type,
|
||||||
handler, adev);
|
handler, context);
|
||||||
if (ACPI_FAILURE(status))
|
if (ACPI_FAILURE(status))
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
|
@ -57,7 +57,7 @@ static int acpi_hed_add(struct acpi_device *device)
|
|||||||
hed_handle = device->handle;
|
hed_handle = device->handle;
|
||||||
|
|
||||||
err = acpi_dev_install_notify_handler(device, ACPI_DEVICE_NOTIFY,
|
err = acpi_dev_install_notify_handler(device, ACPI_DEVICE_NOTIFY,
|
||||||
acpi_hed_notify);
|
acpi_hed_notify, device);
|
||||||
if (err)
|
if (err)
|
||||||
hed_handle = NULL;
|
hed_handle = NULL;
|
||||||
|
|
||||||
|
@ -3391,7 +3391,7 @@ static int acpi_nfit_add(struct acpi_device *adev)
|
|||||||
return rc;
|
return rc;
|
||||||
|
|
||||||
rc = acpi_dev_install_notify_handler(adev, ACPI_DEVICE_NOTIFY,
|
rc = acpi_dev_install_notify_handler(adev, ACPI_DEVICE_NOTIFY,
|
||||||
acpi_nfit_notify);
|
acpi_nfit_notify, adev);
|
||||||
if (rc)
|
if (rc)
|
||||||
return rc;
|
return rc;
|
||||||
|
|
||||||
|
@ -956,7 +956,7 @@ static int acpi_thermal_add(struct acpi_device *device)
|
|||||||
acpi_device_bid(device), deci_kelvin_to_celsius(tz->temperature));
|
acpi_device_bid(device), deci_kelvin_to_celsius(tz->temperature));
|
||||||
|
|
||||||
result = acpi_dev_install_notify_handler(device, ACPI_DEVICE_NOTIFY,
|
result = acpi_dev_install_notify_handler(device, ACPI_DEVICE_NOTIFY,
|
||||||
acpi_thermal_notify);
|
acpi_thermal_notify, device);
|
||||||
if (result)
|
if (result)
|
||||||
goto flush_wq;
|
goto flush_wq;
|
||||||
|
|
||||||
|
@ -517,7 +517,7 @@ int acpi_bus_attach_private_data(acpi_handle, void *);
|
|||||||
void acpi_bus_detach_private_data(acpi_handle);
|
void acpi_bus_detach_private_data(acpi_handle);
|
||||||
int acpi_dev_install_notify_handler(struct acpi_device *adev,
|
int acpi_dev_install_notify_handler(struct acpi_device *adev,
|
||||||
u32 handler_type,
|
u32 handler_type,
|
||||||
acpi_notify_handler handler);
|
acpi_notify_handler handler, void *context);
|
||||||
void acpi_dev_remove_notify_handler(struct acpi_device *adev,
|
void acpi_dev_remove_notify_handler(struct acpi_device *adev,
|
||||||
u32 handler_type,
|
u32 handler_type,
|
||||||
acpi_notify_handler handler);
|
acpi_notify_handler handler);
|
||||||
|
Loading…
Reference in New Issue
Block a user