[PATCH v2 05/10] platform/x86: classmate-laptop: Register ACPI notify handlers directly
From: Rafael J. Wysocki
Date: Mon May 11 2026 - 16:17:20 EST
From: "Rafael J. Wysocki" <rafael.j.wysocki@xxxxxxxxx>
To facilitate subsequent conversion of the driver to using struct
platform_driver instead of struct acpi_driver, make it install its ACPI
notify handlers directly instead of using struct acpi_driver .notify()
callbacks.
No intentional functional impact.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
---
v1 -> v2: Rebase
---
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 bc229771e7ba..8507483b23f9 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:
@@ -437,6 +446,8 @@ static int cmpc_accel_add_v4(struct acpi_device *acpi)
static void cmpc_accel_remove_v4(struct acpi_device *acpi)
{
+ 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);
@@ -457,7 +468,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,
};
@@ -539,8 +549,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;
@@ -663,10 +675,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);
return error;
@@ -674,6 +693,8 @@ static int cmpc_accel_add(struct acpi_device *acpi)
static void cmpc_accel_remove(struct acpi_device *acpi)
{
+ 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);
}
@@ -690,7 +711,6 @@ static struct acpi_driver cmpc_accel_acpi_driver = {
.ops = {
.add = cmpc_accel_add,
.remove = cmpc_accel_remove,
- .notify = cmpc_accel_handler,
}
};
@@ -716,8 +736,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);
@@ -746,11 +767,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);
}
@@ -782,7 +816,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,
};
@@ -1046,8 +1079,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;
@@ -1069,11 +1103,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);
}
@@ -1089,7 +1136,6 @@ static struct acpi_driver cmpc_keys_acpi_driver = {
.ops = {
.add = cmpc_keys_add,
.remove = cmpc_keys_remove,
- .notify = cmpc_keys_handler,
}
};
--
2.51.0