On Sunday, June 24, 2012, Éric Piel wrote: > On 23-06-12 23:16, Rafael J. Wysocki wrote: > > From: Rafael J. Wysocki <rjw@xxxxxxx> > > > > 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@xxxxxxx> > Hello, > Looks fine from my point of view. > > Reviewed-by: Éric Piel <eric.piel@xxxxxxxxxxxxxxxx> Thanks a lot! Rafael > > --- > > drivers/platform/x86/hp_accel.c | 15 ++++++++------- > > 1 file changed, 8 insertions(+), 7 deletions(-) > > > > Index: linux/drivers/platform/x86/hp_accel.c > > =================================================================== > > --- linux.orig/drivers/platform/x86/hp_accel.c > > +++ linux/drivers/platform/x86/hp_accel.c > > @@ -353,20 +353,22 @@ static int lis3lv02d_remove(struct acpi_ > > > > > > #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 */ > > @@ -377,9 +379,8 @@ static struct acpi_driver lis3lv02d_driv > > .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) > > > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pm" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html