[PATCH v1 05/10] platform/x86: classmate-laptop: Register ACPI notify handlers directly
From: Rafael J. Wysocki
Date: Thu May 07 2026 - 16:17:40 EST
From: "Rafael J. Wysocki" <rafael.j.wysocki@xxxxxxxxx>
To facilitate subsequent conversions of classmate-laptop driver
subdrivers to using struct platform_driver instead of struct
acpi_driver, make them install their ACPI notify handlers directly
instead of using .notify() callbacks in struct acpi_driver.
No intentional functional impact.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
---
drivers/platform/x86/classmate-laptop.c | 66 +++++++++++++++++++++----
1 file changed, 56 insertions(+), 10 deletions(-)
diff --git a/drivers/platform/x86/classmate-laptop.c b/drivers/platform/x86/classmate-laptop.c
index bb575ae2bc89..938014c0e613 100644
--- a/drivers/platform/x86/classmate-laptop.c
+++ b/drivers/platform/x86/classmate-laptop.c
@@ -177,8 +177,10 @@ static acpi_status cmpc_get_accel_v4(acpi_handle handle,
return status;
}
-static void cmpc_accel_handler_v4(struct acpi_device *dev, u32 event)
+static void cmpc_accel_handler_v4(acpi_handle handle, u32 event, void *data)
{
+ struct acpi_device *dev = data;
+
if (event == 0x81) {
int16_t x, y, z;
acpi_status status;
@@ -424,10 +426,17 @@ static int cmpc_accel_add_v4(struct acpi_device *acpi)
if (error)
goto failed_g_select;
+ error = acpi_dev_install_notify_handler(acpi, ACPI_DEVICE_NOTIFY,
+ cmpc_accel_handler_v4, acpi);
+ if (error)
+ goto failed_notify_handler;
+
dev_set_drvdata(&inputdev->dev, accel);
return 0;
+failed_notify_handler:
+ device_remove_file(&acpi->dev, &cmpc_accel_g_select_attr_v4);
failed_g_select:
device_remove_file(&acpi->dev, &cmpc_accel_sensitivity_attr_v4);
failed_sensitivity:
@@ -442,6 +451,8 @@ static void cmpc_accel_remove_v4(struct acpi_device *acpi)
struct input_dev *inputdev = dev_get_drvdata(&acpi->dev);
struct cmpc_accel *accel = dev_get_drvdata(&inputdev->dev);
+ acpi_dev_remove_notify_handler(acpi, ACPI_DEVICE_NOTIFY,
+ cmpc_accel_handler_v4);
device_remove_file(&acpi->dev, &cmpc_accel_g_select_attr_v4);
device_remove_file(&acpi->dev, &cmpc_accel_sensitivity_attr_v4);
cmpc_remove_notify_device(&acpi->dev);
@@ -463,7 +474,6 @@ static struct acpi_driver cmpc_accel_acpi_driver_v4 = {
.ops = {
.add = cmpc_accel_add_v4,
.remove = cmpc_accel_remove_v4,
- .notify = cmpc_accel_handler_v4,
},
.drv.pm = &cmpc_accel_pm,
};
@@ -545,8 +555,10 @@ static acpi_status cmpc_get_accel(acpi_handle handle,
return status;
}
-static void cmpc_accel_handler(struct acpi_device *dev, u32 event)
+static void cmpc_accel_handler(acpi_handle handle, u32 event, void *data)
{
+ struct acpi_device *dev = data;
+
if (event == 0x81) {
unsigned char x, y, z;
acpi_status status;
@@ -669,10 +681,17 @@ static int cmpc_accel_add(struct acpi_device *acpi)
if (error)
goto failed_file;
+ error = acpi_dev_install_notify_handler(acpi, ACPI_DEVICE_NOTIFY,
+ cmpc_accel_handler, acpi);
+ if (error)
+ goto failed_notify_handler;
+
dev_set_drvdata(&inputdev->dev, accel);
return 0;
+failed_notify_handler:
+ device_remove_file(&acpi->dev, &cmpc_accel_sensitivity_attr);
failed_file:
cmpc_remove_notify_device(&acpi->dev);
failed_input:
@@ -685,6 +704,8 @@ static void cmpc_accel_remove(struct acpi_device *acpi)
struct input_dev *inputdev = dev_get_drvdata(&acpi->dev);
struct cmpc_accel *accel = dev_get_drvdata(&inputdev->dev);
+ acpi_dev_remove_notify_handler(acpi, ACPI_DEVICE_NOTIFY,
+ cmpc_accel_handler);
device_remove_file(&acpi->dev, &cmpc_accel_sensitivity_attr);
cmpc_remove_notify_device(&acpi->dev);
kfree(accel);
@@ -702,7 +723,6 @@ static struct acpi_driver cmpc_accel_acpi_driver = {
.ops = {
.add = cmpc_accel_add,
.remove = cmpc_accel_remove,
- .notify = cmpc_accel_handler,
}
};
@@ -728,8 +748,9 @@ static acpi_status cmpc_get_tablet(acpi_handle handle,
return status;
}
-static void cmpc_tablet_handler(struct acpi_device *dev, u32 event)
+static void cmpc_tablet_handler(acpi_handle handle, u32 event, void *data)
{
+ struct acpi_device *dev = data;
unsigned long long val = 0;
struct input_dev *inputdev = dev_get_drvdata(&dev->dev);
@@ -758,11 +779,24 @@ static void cmpc_tablet_idev_init(struct input_dev *inputdev)
static int cmpc_tablet_add(struct acpi_device *acpi)
{
- return cmpc_add_notify_device(&acpi->dev, "cmpc_tablet", cmpc_tablet_idev_init);
+ int error;
+
+ error = cmpc_add_notify_device(&acpi->dev, "cmpc_tablet", cmpc_tablet_idev_init);
+ if (error)
+ return error;
+
+ error = acpi_dev_install_notify_handler(acpi, ACPI_DEVICE_NOTIFY,
+ cmpc_tablet_handler, acpi);
+ if (error)
+ cmpc_remove_notify_device(&acpi->dev);
+
+ return error;
}
static void cmpc_tablet_remove(struct acpi_device *acpi)
{
+ acpi_dev_remove_notify_handler(acpi, ACPI_DEVICE_NOTIFY,
+ cmpc_tablet_handler);
cmpc_remove_notify_device(&acpi->dev);
}
@@ -794,7 +828,6 @@ static struct acpi_driver cmpc_tablet_acpi_driver = {
.ops = {
.add = cmpc_tablet_add,
.remove = cmpc_tablet_remove,
- .notify = cmpc_tablet_handler,
},
.drv.pm = &cmpc_tablet_pm,
};
@@ -1058,8 +1091,9 @@ static int cmpc_keys_codes[] = {
KEY_MAX
};
-static void cmpc_keys_handler(struct acpi_device *dev, u32 event)
+static void cmpc_keys_handler(acpi_handle handle, u32 event, void *data)
{
+ struct acpi_device *dev = data;
struct input_dev *inputdev;
int code = KEY_MAX;
@@ -1081,11 +1115,24 @@ static void cmpc_keys_idev_init(struct input_dev *inputdev)
static int cmpc_keys_add(struct acpi_device *acpi)
{
- return cmpc_add_notify_device(&acpi->dev, "cmpc_keys", cmpc_keys_idev_init);
+ int error;
+
+ error = cmpc_add_notify_device(&acpi->dev, "cmpc_keys", cmpc_keys_idev_init);
+ if (error)
+ return error;
+
+ error = acpi_dev_install_notify_handler(acpi, ACPI_DEVICE_NOTIFY,
+ cmpc_keys_handler, acpi);
+ if (error)
+ cmpc_remove_notify_device(&acpi->dev);
+
+ return error;
}
static void cmpc_keys_remove(struct acpi_device *acpi)
{
+ acpi_dev_remove_notify_handler(acpi, ACPI_DEVICE_NOTIFY,
+ cmpc_keys_handler);
cmpc_remove_notify_device(&acpi->dev);
}
@@ -1101,7 +1148,6 @@ static struct acpi_driver cmpc_keys_acpi_driver = {
.ops = {
.add = cmpc_keys_add,
.remove = cmpc_keys_remove,
- .notify = cmpc_keys_handler,
}
};