Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

panasonic-laptop: Use struct dev_pm_ops for power management

Browse source 
Make the panasonic-laptop driver define its PM callbacks through
a struct dev_pm_ops object rather than by using legacy PM hooks
in struct acpi_device_ops.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
Rafael J. Wysocki 2012-06-27 23:27:40 +02:00
parent bb6b98d6e4
commit a737741962
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/platform/x86/panasonic-laptop.c
View file

@ -177,7 +177,6 @@ enum SINF_BITS { SINF_NUM_BATTERIES = 0,
static int acpi_pcc_hotkey_add(struct acpi_device *device); static int acpi_pcc_hotkey_add(struct acpi_device *device);
static int acpi_pcc_hotkey_remove(struct acpi_device *device, int type); static int acpi_pcc_hotkey_remove(struct acpi_device *device, int type);
static int acpi_pcc_hotkey_resume(struct acpi_device *device);
static void acpi_pcc_hotkey_notify(struct acpi_device *device, u32 event); static void acpi_pcc_hotkey_notify(struct acpi_device *device, u32 event);
static const struct acpi_device_id pcc_device_ids[] = { static const struct acpi_device_id pcc_device_ids[] = {
@ -189,6 +188,9 @@ static const struct acpi_device_id pcc_device_ids[] = {
}; };
MODULE_DEVICE_TABLE(acpi, pcc_device_ids); MODULE_DEVICE_TABLE(acpi, pcc_device_ids);
static int acpi_pcc_hotkey_resume(struct device *dev);
static SIMPLE_DEV_PM_OPS(acpi_pcc_hotkey_pm, NULL, acpi_pcc_hotkey_resume);
static struct acpi_driver acpi_pcc_driver = { static struct acpi_driver acpi_pcc_driver = {
.name = ACPI_PCC_DRIVER_NAME, .name = ACPI_PCC_DRIVER_NAME,
.class = ACPI_PCC_CLASS, .class = ACPI_PCC_CLASS,
@ -196,9 +198,9 @@ static struct acpi_driver acpi_pcc_driver = {
.ops = { .ops = {
.add = acpi_pcc_hotkey_add, .add = acpi_pcc_hotkey_add,
.remove = acpi_pcc_hotkey_remove, .remove = acpi_pcc_hotkey_remove,
.resume = acpi_pcc_hotkey_resume,
.notify = acpi_pcc_hotkey_notify, .notify = acpi_pcc_hotkey_notify,
}, },
.drv.pm = &acpi_pcc_hotkey_pm,
}; };
static const struct key_entry panasonic_keymap[] = { static const struct key_entry panasonic_keymap[] = {
@ -538,11 +540,15 @@ static void acpi_pcc_destroy_input(struct pcc_acpi *pcc)
/* kernel module interface */ /* kernel module interface */
static int acpi_pcc_hotkey_resume(struct acpi_device *device) static int acpi_pcc_hotkey_resume(struct device *dev)
{ {
struct pcc_acpi *pcc = acpi_driver_data(device); struct pcc_acpi *pcc;
if (device == NULL || pcc == NULL) if (!dev)
return -EINVAL;
pcc = acpi_driver_data(to_acpi_device(dev));
if (!pcc)
return -EINVAL; return -EINVAL;
ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Sticky mode restore: %d\n", ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Sticky mode restore: %d\n",