aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2011-03-16 22:08:26 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-03-16 23:28:04 -0700
commit3ff8ff53aae7b7e46dec6a50c29b8a022ec299ba (patch)
tree722afcf322ccd8c1ac3bf1c7c05f3b0f0245488d /drivers
parent6b007d62fabb279b51c784c7c8abc6848b66a917 (diff)
downloadkernel_samsung_smdk4412-3ff8ff53aae7b7e46dec6a50c29b8a022ec299ba.zip
kernel_samsung_smdk4412-3ff8ff53aae7b7e46dec6a50c29b8a022ec299ba.tar.gz
kernel_samsung_smdk4412-3ff8ff53aae7b7e46dec6a50c29b8a022ec299ba.tar.bz2
Input: tsc2005 - convert to using dev_pm_ops
Newer code should not be using legacy suspend/resume methods but rather supply dev_pm_ops structure as it allows better control over power management. Tested-by: Aaro Koskinen <aaro.koskinen@nokia.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/touchscreen/tsc2005.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c
index 5dad30a..109efbf 100644
--- a/drivers/input/touchscreen/tsc2005.c
+++ b/drivers/input/touchscreen/tsc2005.c
@@ -27,6 +27,7 @@
#include <linux/input.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
+#include <linux/pm.h>
#include <linux/spi/spi.h>
#include <linux/spi/tsc2005.h>
@@ -661,8 +662,8 @@ static int __devexit tsc2005_remove(struct spi_device *spi)
return 0;
}
-#ifdef CONFIG_PM
-static int tsc2005_suspend(struct spi_device *spi, pm_message_t mesg)
+#ifdef CONFIG_PM_SLEEP
+static int tsc2005_suspend(struct device *dev)
{
struct spi_device *spi = to_spi_device(dev);
struct tsc2005 *ts = spi_get_drvdata(spi);
@@ -674,7 +675,7 @@ static int tsc2005_suspend(struct spi_device *spi, pm_message_t mesg)
return 0;
}
-static int tsc2005_resume(struct spi_device *spi)
+static int tsc2005_resume(struct device *dev)
{
struct spi_device *spi = to_spi_device(dev);
struct tsc2005 *ts = spi_get_drvdata(spi);
@@ -687,17 +688,16 @@ static int tsc2005_resume(struct spi_device *spi)
}
#endif
+static SIMPLE_DEV_PM_OPS(tsc2005_pm_ops, tsc2005_suspend, tsc2005_resume);
+
static struct spi_driver tsc2005_driver = {
- .driver = {
- .name = "tsc2005",
- .owner = THIS_MODULE,
+ .driver = {
+ .name = "tsc2005",
+ .owner = THIS_MODULE,
+ .pm = &tsc2005_pm_ops,
},
-#ifdef CONFIG_PM
- .suspend = tsc2005_suspend,
- .resume = tsc2005_resume,
-#endif
- .probe = tsc2005_probe,
- .remove = __devexit_p(tsc2005_remove),
+ .probe = tsc2005_probe,
+ .remove = __devexit_p(tsc2005_remove),
};
static int __init tsc2005_init(void)