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

platform/x86: toshiba_acpi: 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/5070377.GXAFRqVoOG@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-24 20:58:48 +01:00 committed by Ilpo Järvinen
parent 99aef5d711
commit b0bcf48c74
No known key found for this signature in database
GPG Key ID: 59AC4F6153E5CE31
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/platform/x86/toshiba_acpi.c
View File

@ -223,6 +223,7 @@ struct toshiba_acpi_dev {
unsigned int cooling_method_supported:1;
unsigned int battery_charge_mode_supported:1;
unsigned int sysfs_created:1;
unsigned int notify_handler_installed:1;
unsigned int special_functions;
bool kbd_event_generated;
@ -3193,9 +3194,10 @@ static void print_supported_features(struct toshiba_acpi_dev *dev)
pr_cont("\n");
}
static void toshiba_acpi_notify(struct acpi_device *acpi_dev, u32 event)
static void toshiba_acpi_notify(acpi_handle handle, u32 event, void *data)
{
struct toshiba_acpi_dev *dev = acpi_driver_data(acpi_dev);
struct toshiba_acpi_dev *dev = data;
struct acpi_device *acpi_dev = dev->acpi_dev;
switch (event) {
case 0x80: /* Hotkeys and some system events */
@ -3261,6 +3263,10 @@ static void toshiba_acpi_remove(struct acpi_device *acpi_dev)
remove_toshiba_proc_entries(dev);
if (dev->notify_handler_installed)
acpi_dev_remove_notify_handler(acpi_dev, ACPI_DEVICE_NOTIFY,
toshiba_acpi_notify);
#if IS_ENABLED(CONFIG_HWMON)
if (dev->hwmon_device)
hwmon_device_unregister(dev->hwmon_device);
@ -3537,6 +3543,13 @@ static int toshiba_acpi_add(struct acpi_device *acpi_dev)
}
dev->sysfs_created = !ret;
ret = acpi_dev_install_notify_handler(acpi_dev, ACPI_DEVICE_NOTIFY,
toshiba_acpi_notify, dev);
if (ret)
goto error;
dev->notify_handler_installed = 1;
create_toshiba_proc_entries(dev);
toshiba_acpi = dev;
@ -3602,7 +3615,6 @@ static struct acpi_driver toshiba_acpi_driver = {
.ops = {
.add = toshiba_acpi_add,
.remove = toshiba_acpi_remove,
.notify = toshiba_acpi_notify,
},
.drv.pm = &toshiba_acpi_pm,
};