acerhdf: convert to dev_pm_ops
PATCH 3/8 acerhdf: convert to dev_pm_ops
From: Borislav Petkov <[email protected]>
Signed-off-by Borislav Petkov <[email protected]>
Signed-off-by Peter Feuerer <[email protected]>
Cc Andreas Mohr <[email protected]>
Cc Len Brown <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/platform/x86/acerhdf.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)
drivers/platform/x86/acerhdf.c renamed from drivers/platform/x86/acerhdf.c~acerhdf-convert-to-dev_pm_ops +9 -13
@@ -52,7 +52,7 @@*/ #undef START_IN_KERNEL_MODE -#define DRV_VER "0.5.16" +#define DRV_VER "0.5.17"/* * According to the Atom N270 datasheet,
@@ -435,7 +435,7 @@ struct thermal_cooling_device_ops acerhd };/* suspend / resume functionality */ -static int acerhdf_suspend (struct platform_device *dev,pm_message_t state) +static int acerhdf_suspend (struct device *dev) {if (kernelmode)acerhdf_change_fanstate (ACERHDF_FAN_AUTO );
@@ -446,14 +446,6 @@ static int acerhdf_suspend(struct platforeturn 0 ; } -static int acerhdf_resume (struct platform_device *device) -{ -if (verbose) -pr_notice ("resuming\n" ); - -return 0 ; -} -static int __devinit acerhdf_probe (struct platform_device *device) {return 0 ;
@@ -464,15 +456,19 @@ static int acerhdf_remove(struct platforreturn 0 ; } +static struct dev_pm_ops acerhdf_pm_ops = { + .suspend = acerhdf_suspend, + .freeze = acerhdf_suspend, +}; +static struct platform_driver acerhdf_driver = { .driver = { - .name ="acerhdf" , + .name ="acerhdf" , .owner =THIS_MODULE , + .pm = &acerhdf_pm_ops, }, .probe = acerhdf_probe, .remove = acerhdf_remove, - .suspend = acerhdf_suspend, - .resume = acerhdf_resume, };
_
applied
thanks,
Len Brown, Intel Open Source Technology Center