lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tc1100-wmi - switch to using dev_pm_ops

Browse Source 
Also guard PM operations with CONFIG_PM.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Dmitry Torokhov
2009-12-04 00:36:20 -08:00
committed by Len Brown
parent 9634a627b3
commit 8e698a3c47
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/platform/x86/tc1100-wmi.c
View File

@@ -194,7 +194,8 @@ static int __devexit tc1100_remove(struct platform_device *device)
return 0; return 0;
} }
static int tc1100_suspend(struct platform_device *dev, pm_message_t state) #ifdef CONFIG_PM
static int tc1100_suspend(struct device *dev)
{ {
int ret; int ret;
@@ -206,10 +207,10 @@ static int tc1100_suspend(struct platform_device *dev, pm_message_t state)
if (ret) if (ret)
return ret; return ret;
return ret; return 0;
} }
static int tc1100_resume(struct platform_device *dev) static int tc1100_resume(struct device *dev)
{ {
int ret; int ret;
@@ -221,17 +222,26 @@ static int tc1100_resume(struct platform_device *dev)
if (ret) if (ret)
return ret; return ret;
return ret; return 0;
} }
static const struct dev_pm_ops tc1100_pm_ops = {
.suspend = tc1100_suspend,
.resume = tc1100_resume,
.freeze = tc1100_suspend,
.restore = tc1100_resume,
};
#endif
static struct platform_driver tc1100_driver = { static struct platform_driver tc1100_driver = {
.driver = { .driver = {
.name = "tc1100-wmi", .name = "tc1100-wmi",
.owner = THIS_MODULE, .owner = THIS_MODULE,
#ifdef CONFIG_PM
.pm = &tc1100_pm_ops,
#endif
}, },
.remove = __devexit_p(tc1100_remove), .remove = __devexit_p(tc1100_remove),
.suspend = tc1100_suspend,
.resume = tc1100_resume,
}; };
static int __init tc1100_init(void) static int __init tc1100_init(void)