Skip to content

Commit

Permalink
hp_accel: Use struct dev_pm_ops for power management
Browse files Browse the repository at this point in the history
Make the hp_accel 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>
Reviewed-by: Éric Piel <eric.piel@tremplin-utc.net>
  • Loading branch information
Rafael J. Wysocki committed Jul 1, 2012
1 parent 43d2fd3 commit 4ce05b4
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions drivers/platform/x86/hp_accel.c
Original file line number Diff line number Diff line change
Expand Up @@ -353,20 +353,22 @@ static int lis3lv02d_remove(struct acpi_device *device, int type)


#ifdef CONFIG_PM
static int lis3lv02d_suspend(struct acpi_device *device)
static int lis3lv02d_suspend(struct device *dev)
{
/* make sure the device is off when we suspend */
lis3lv02d_poweroff(&lis3_dev);
return 0;
}

static int lis3lv02d_resume(struct acpi_device *device)
static int lis3lv02d_resume(struct device *dev)
{
return lis3lv02d_poweron(&lis3_dev);
}

static SIMPLE_DEV_PM_OPS(hp_accel_pm, lis3lv02d_suspend, lis3lv02d_resume);
#define HP_ACCEL_PM (&hp_accel_pm)
#else
#define lis3lv02d_suspend NULL
#define lis3lv02d_resume NULL
#define HP_ACCEL_PM NULL
#endif

/* For the HP MDPS aka 3D Driveguard */
Expand All @@ -377,9 +379,8 @@ static struct acpi_driver lis3lv02d_driver = {
.ops = {
.add = lis3lv02d_add,
.remove = lis3lv02d_remove,
.suspend = lis3lv02d_suspend,
.resume = lis3lv02d_resume,
}
},
.drv.pm = HP_ACCEL_PM,
};

static int __init lis3lv02d_init_module(void)
Expand Down

0 comments on commit 4ce05b4

Please sign in to comment.