Unverified Commit 0381b6a6 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Ilpo Järvinen
Browse files

platform/x86: panasonic-laptop: Register ACPI notify handler directly 



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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/13979037.uLZWGnKmhe@rafael.j.wysocki


Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent a347e112

drivers/platform/x86/panasonic-laptop.c

+15 −5
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ enum SINF_BITS { SINF_NUM_BATTERIES = 0, 


static int acpi_pcc_hotkey_add(struct acpi_device *device);

static void acpi_pcc_hotkey_remove(struct acpi_device *device);

static void acpi_pcc_hotkey_notify(struct acpi_device *device, u32 event);

static void acpi_pcc_hotkey_notify(acpi_handle handle, u32 event, void *data);



static const struct acpi_device_id pcc_device_ids[] = {

	{ "MAT0012", 0},
@@ -208,7 +208,6 @@ static struct acpi_driver acpi_pcc_driver = { 
	.ops =		{

				.add =		acpi_pcc_hotkey_add,

				.remove =	acpi_pcc_hotkey_remove,

				.notify =	acpi_pcc_hotkey_notify,

			},

	.drv.pm =	&acpi_pcc_hotkey_pm,

};
@@ -869,9 +868,9 @@ static void acpi_pcc_generate_keyinput(struct pcc_acpi *pcc) 
		pr_err("Unknown hotkey event: 0x%04llx\n", result);

}



static void acpi_pcc_hotkey_notify(struct acpi_device *device, u32 event)

static void acpi_pcc_hotkey_notify(acpi_handle handle, u32 event, void *data)

{

	struct pcc_acpi *pcc = acpi_driver_data(device);

	struct pcc_acpi *pcc = data;



	switch (event) {

	case HKEY_NOTIFY:
@@ -1070,13 +1069,18 @@ static int acpi_pcc_hotkey_add(struct acpi_device *device) 
	if (result)

		goto out_backlight;



	result = acpi_dev_install_notify_handler(device, ACPI_DEVICE_NOTIFY,

						 acpi_pcc_hotkey_notify, pcc);

	if (result)

		goto out_sysfs;



	/* optical drive initialization */

	if (ACPI_SUCCESS(check_optd_present())) {

		pcc->platform = platform_device_register_simple("panasonic",

			PLATFORM_DEVID_NONE, NULL, 0);

		if (IS_ERR(pcc->platform)) {

			result = PTR_ERR(pcc->platform);

			goto out_sysfs;

			goto out_notify_handler;

		}

		result = device_create_file(&pcc->platform->dev,

			&dev_attr_cdpower);
@@ -1093,6 +1097,9 @@ static int acpi_pcc_hotkey_add(struct acpi_device *device) 


out_platform:

	platform_device_unregister(pcc->platform);

out_notify_handler:

	acpi_dev_remove_notify_handler(device, ACPI_DEVICE_NOTIFY,

				       acpi_pcc_hotkey_notify);

out_sysfs:

	sysfs_remove_group(&device->dev.kobj, &pcc_attr_group);

out_backlight:
@@ -1119,6 +1126,9 @@ static void acpi_pcc_hotkey_remove(struct acpi_device *device) 
		platform_device_unregister(pcc->platform);

	}



	acpi_dev_remove_notify_handler(device, ACPI_DEVICE_NOTIFY,

				       acpi_pcc_hotkey_notify);



	sysfs_remove_group(&device->dev.kobj, &pcc_attr_group);



	backlight_device_unregister(pcc->backlight);