@@ -251,16 +251,10 @@ static int enqueue_events(struct acpi_device *adev, const u8 *buf, u32 length)
return 0;
}
-/**
- * event_device_notify() - Callback when EC generates an event over ACPI.
- * @adev: The device that the event is coming from.
- * @value: Value passed to Notify() in ACPI.
- *
- * This function will read the events from the device and enqueue them.
- */
-static void event_device_notify(struct acpi_device *adev, u32 value)
+static void event_device_notify(acpi_handle handle, u32 value, void *data)
{
struct acpi_buffer event_buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+ struct acpi_device *adev = data;
union acpi_object *obj;
acpi_status status;
@@ -490,7 +484,12 @@ static int event_device_add(struct acpi_device *adev)
if (error)
goto free_dev_data;
- return 0;
+ error = acpi_device_install_event_handler(adev, ACPI_DEVICE_NOTIFY,
+ event_device_notify);
+ if (error)
+ goto free_dev_data;
+
+ return error;
free_dev_data:
hangup_device(dev_data);
@@ -503,6 +502,7 @@ static void event_device_remove(struct acpi_device *adev)
{
struct event_device_data *dev_data = adev->driver_data;
+ acpi_device_remove_event_handler(adev, ACPI_DEVICE_NOTIFY, event_device_notify);
cdev_device_del(&dev_data->cdev, &dev_data->dev);
ida_simple_remove(&event_ida, MINOR(dev_data->dev.devt));
hangup_device(dev_data);
@@ -520,7 +520,6 @@ static struct acpi_driver event_driver = {
.ids = event_acpi_ids,
.ops = {
.add = event_device_add,
- .notify = event_device_notify,
.remove = event_device_remove,
},
.owner = THIS_MODULE,
Currently logic for installing notifications from ACPI devices is implemented using notify callback in struct acpi_driver. Preparations are being made to replace acpi_driver with more generic struct platform_driver, which doesn't contain notify callback. Furthermore as of now handlers are being called indirectly through acpi_notify_device(), which decreases performance. Call acpi_device_install_event_handler() at the end of .add() callback. Call acpi_device_remove_event_handler() at the beginning of .remove() callback. Change arguments passed to the notify callback to match with what's required by acpi_device_install_event_handler(). Signed-off-by: Michal Wilczynski <michal.wilczynski@intel.com> --- drivers/platform/chrome/wilco_ec/event.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)