github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 10:33:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

platform/x86: dell/dell-rbtn: Register ACPI notify handler directly

Browse Source 
To facilitate subsequent conversion of the driver to a platform one,
make it install an ACPI notify handler directly instead of using
a .notify() callback in struct acpi_driver.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/9591832.CDJkKcVGEf@rafael.j.wysocki
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
This commit is contained in:
Rafael J. Wysocki 2026-03-18 15:35:05 +01:00 committed by Ilpo Järvinen
parent 80b8f68b94
commit da71de1b46
No known key found for this signature in database
GPG Key ID: 59AC4F6153E5CE31
1 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/platform/x86/dell/dell-rbtn.c
View File

@ -207,7 +207,7 @@ static void rbtn_input_event(struct rbtn_data *rbtn_data)
static int rbtn_add(struct acpi_device *device);
static void rbtn_remove(struct acpi_device *device);
static void rbtn_notify(struct acpi_device *device, u32 event);
static void rbtn_notify(acpi_handle handle, u32 event, void *data);
static const struct acpi_device_id rbtn_ids[] = {
{ "DELRBTN", 0 },
@ -293,7 +293,6 @@ static struct acpi_driver rbtn_driver = {
.ops = {
.add = rbtn_add,
.remove = rbtn_remove,
.notify = rbtn_notify,
},
};
@ -382,6 +381,22 @@ EXPORT_SYMBOL_GPL(dell_rbtn_notifier_unregister);
* acpi driver functions
*/
static void rbtn_cleanup(struct acpi_device *device)
{
struct rbtn_data *rbtn_data = device->driver_data;
switch (rbtn_data->type) {
case RBTN_TOGGLE:
rbtn_input_exit(rbtn_data);
break;
case RBTN_SLIDER:
rbtn_rfkill_exit(device);
break;
default:
break;
}
}
static int rbtn_add(struct acpi_device *device)
{
struct rbtn_data *rbtn_data;
@ -422,31 +437,32 @@ static int rbtn_add(struct acpi_device *device)
break;
}
if (ret)
rbtn_acquire(device, false);
goto err;
ret = acpi_dev_install_notify_handler(device, ACPI_DEVICE_NOTIFY,
rbtn_notify, device);
if (ret)
goto err_cleanup;
return 0;
err_cleanup:
rbtn_cleanup(device);
err:
rbtn_acquire(device, false);
return ret;
}
static void rbtn_remove(struct acpi_device *device)
{
struct rbtn_data *rbtn_data = device->driver_data;
switch (rbtn_data->type) {
case RBTN_TOGGLE:
rbtn_input_exit(rbtn_data);
break;
case RBTN_SLIDER:
rbtn_rfkill_exit(device);
break;
default:
break;
}
acpi_dev_remove_notify_handler(device, ACPI_DEVICE_NOTIFY, rbtn_notify);
rbtn_cleanup(device);
rbtn_acquire(device, false);
}
static void rbtn_notify(struct acpi_device *device, u32 event)
static void rbtn_notify(acpi_handle handle, u32 event, void *data)
{
struct acpi_device *device = data;
struct rbtn_data *rbtn_data = device->driver_data;
/*