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@xxxxxxxxx>
---
drivers/virt/vmgenid.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/drivers/virt/vmgenid.c b/drivers/virt/vmgenid.c
index a1c467a0e9f7..b5532215e476 100644
--- a/drivers/virt/vmgenid.c
+++ b/drivers/virt/vmgenid.c
@@ -60,16 +60,26 @@ static int vmgenid_add(struct acpi_device *device)
device->driver_data = state;
+ ret = acpi_device_install_event_handler(device, ACPI_DEVICE_NOTIFY, vmgenid_notify);
+
out:
ACPI_FREE(parsed.pointer);
return ret;
}
-static void vmgenid_notify(struct acpi_device *device, u32 event)
+static void vmgenid_remove(struct acpi_device *device)
+{
+ acpi_device_remove_event_handler(device, ACPI_DEVICE_NOTIFY, vmgenid_notify);
+}
+
+static void vmgenid_notify(acpi_handle handle, u32 event, void *data)
{
- struct vmgenid_state *state = acpi_driver_data(device);
+ struct acpi_device *device = data;
+ struct vmgenid_state *state;
u8 old_id[VMGENID_SIZE];
+ state = acpi_driver_data(device);
+
memcpy(old_id, state->this_id, sizeof(old_id));
memcpy(state->this_id, state->next_id, sizeof(state->this_id));
if (!memcmp(old_id, state->this_id, sizeof(old_id)))
@@ -89,7 +99,7 @@ static struct acpi_driver vmgenid_driver = {
.owner = THIS_MODULE,
.ops = {
.add = vmgenid_add,
- .notify = vmgenid_notify
+ .remove = vmgenid_remove,
}
};
--
2.38.1
