Skip to content

Commit

Permalink
panasonic-laptop: Use struct dev_pm_ops for power management
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rafael J. Wysocki committed Jul 1, 2012
1 parent bb6b98d commit a737741
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions drivers/platform/x86/panasonic-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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_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 const struct acpi_device_id pcc_device_ids[] = {
Expand All @@ -189,16 +188,19 @@ static const struct acpi_device_id 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 = {
.name = ACPI_PCC_DRIVER_NAME,
.class = ACPI_PCC_CLASS,
.ids = pcc_device_ids,
.ops = {
.add = acpi_pcc_hotkey_add,
.remove = acpi_pcc_hotkey_remove,
.resume = acpi_pcc_hotkey_resume,
.notify = acpi_pcc_hotkey_notify,
},
.drv.pm = &acpi_pcc_hotkey_pm,
};

static const struct key_entry panasonic_keymap[] = {
Expand Down Expand Up @@ -538,11 +540,15 @@ static void acpi_pcc_destroy_input(struct pcc_acpi *pcc)

/* 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 (!dev)
return -EINVAL;

if (device == NULL || pcc == NULL)
pcc = acpi_driver_data(to_acpi_device(dev));
if (!pcc)
return -EINVAL;

ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Sticky mode restore: %d\n",
Expand Down

0 comments on commit a737741

Please sign in to comment.