|
@@ -412,25 +412,24 @@ static int tdo24m_remove(struct spi_device *spi)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-#ifdef CONFIG_PM
|
|
|
-static int tdo24m_suspend(struct spi_device *spi, pm_message_t state)
|
|
|
+#ifdef CONFIG_PM_SLEEP
|
|
|
+static int tdo24m_suspend(struct device *dev)
|
|
|
{
|
|
|
- struct tdo24m *lcd = spi_get_drvdata(spi);
|
|
|
+ struct tdo24m *lcd = dev_get_drvdata(dev);
|
|
|
|
|
|
return tdo24m_power(lcd, FB_BLANK_POWERDOWN);
|
|
|
}
|
|
|
|
|
|
-static int tdo24m_resume(struct spi_device *spi)
|
|
|
+static int tdo24m_resume(struct device *dev)
|
|
|
{
|
|
|
- struct tdo24m *lcd = spi_get_drvdata(spi);
|
|
|
+ struct tdo24m *lcd = dev_get_drvdata(dev);
|
|
|
|
|
|
return tdo24m_power(lcd, FB_BLANK_UNBLANK);
|
|
|
}
|
|
|
-#else
|
|
|
-#define tdo24m_suspend NULL
|
|
|
-#define tdo24m_resume NULL
|
|
|
#endif
|
|
|
|
|
|
+static SIMPLE_DEV_PM_OPS(tdo24m_pm_ops, tdo24m_suspend, tdo24m_resume);
|
|
|
+
|
|
|
/* Power down all displays on reboot, poweroff or halt */
|
|
|
static void tdo24m_shutdown(struct spi_device *spi)
|
|
|
{
|
|
@@ -443,12 +442,11 @@ static struct spi_driver tdo24m_driver = {
|
|
|
.driver = {
|
|
|
.name = "tdo24m",
|
|
|
.owner = THIS_MODULE,
|
|
|
+ .pm = &tdo24m_pm_ops,
|
|
|
},
|
|
|
.probe = tdo24m_probe,
|
|
|
.remove = tdo24m_remove,
|
|
|
.shutdown = tdo24m_shutdown,
|
|
|
- .suspend = tdo24m_suspend,
|
|
|
- .resume = tdo24m_resume,
|
|
|
};
|
|
|
|
|
|
module_spi_driver(tdo24m_driver);
|