|
@@ -121,9 +121,9 @@ static int __devexit platform_lcd_remove(struct platform_device *pdev)
|
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_PM
|
|
|
-static int platform_lcd_suspend(struct platform_device *pdev, pm_message_t st)
|
|
|
+static int platform_lcd_suspend(struct device *dev)
|
|
|
{
|
|
|
- struct platform_lcd *plcd = platform_get_drvdata(pdev);
|
|
|
+ struct platform_lcd *plcd = dev_get_drvdata(dev);
|
|
|
|
|
|
plcd->suspended = 1;
|
|
|
platform_lcd_set_power(plcd->lcd, plcd->power);
|
|
@@ -131,29 +131,30 @@ static int platform_lcd_suspend(struct platform_device *pdev, pm_message_t st)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int platform_lcd_resume(struct platform_device *pdev)
|
|
|
+static int platform_lcd_resume(struct device *dev)
|
|
|
{
|
|
|
- struct platform_lcd *plcd = platform_get_drvdata(pdev);
|
|
|
+ struct platform_lcd *plcd = dev_get_drvdata(dev);
|
|
|
|
|
|
plcd->suspended = 0;
|
|
|
platform_lcd_set_power(plcd->lcd, plcd->power);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
-#else
|
|
|
-#define platform_lcd_suspend NULL
|
|
|
-#define platform_lcd_resume NULL
|
|
|
+
|
|
|
+static SIMPLE_DEV_PM_OPS(platform_lcd_pm_ops, platform_lcd_suspend,
|
|
|
+ platform_lcd_resume);
|
|
|
#endif
|
|
|
|
|
|
static struct platform_driver platform_lcd_driver = {
|
|
|
.driver = {
|
|
|
.name = "platform-lcd",
|
|
|
.owner = THIS_MODULE,
|
|
|
+#ifdef CONFIG_PM
|
|
|
+ .pm = &platform_lcd_pm_ops,
|
|
|
+#endif
|
|
|
},
|
|
|
.probe = platform_lcd_probe,
|
|
|
.remove = __devexit_p(platform_lcd_remove),
|
|
|
- .suspend = platform_lcd_suspend,
|
|
|
- .resume = platform_lcd_resume,
|
|
|
};
|
|
|
|
|
|
module_platform_driver(platform_lcd_driver);
|