Commit 3ff8ff53 authored by Dmitry Torokhov's avatar Dmitry Torokhov

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: default avatarAaro Koskinen <aaro.koskinen@nokia.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 6b007d62
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <linux/input.h> #include <linux/input.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/pm.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/tsc2005.h> #include <linux/spi/tsc2005.h>
...@@ -661,8 +662,8 @@ static int __devexit tsc2005_remove(struct spi_device *spi) ...@@ -661,8 +662,8 @@ static int __devexit tsc2005_remove(struct spi_device *spi)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int tsc2005_suspend(struct spi_device *spi, pm_message_t mesg) static int tsc2005_suspend(struct device *dev)
{ {
struct spi_device *spi = to_spi_device(dev); struct spi_device *spi = to_spi_device(dev);
struct tsc2005 *ts = spi_get_drvdata(spi); struct tsc2005 *ts = spi_get_drvdata(spi);
...@@ -674,7 +675,7 @@ static int tsc2005_suspend(struct spi_device *spi, pm_message_t mesg) ...@@ -674,7 +675,7 @@ static int tsc2005_suspend(struct spi_device *spi, pm_message_t mesg)
return 0; 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 spi_device *spi = to_spi_device(dev);
struct tsc2005 *ts = spi_get_drvdata(spi); struct tsc2005 *ts = spi_get_drvdata(spi);
...@@ -687,15 +688,14 @@ static int tsc2005_resume(struct spi_device *spi) ...@@ -687,15 +688,14 @@ static int tsc2005_resume(struct spi_device *spi)
} }
#endif #endif
static SIMPLE_DEV_PM_OPS(tsc2005_pm_ops, tsc2005_suspend, tsc2005_resume);
static struct spi_driver tsc2005_driver = { static struct spi_driver tsc2005_driver = {
.driver = { .driver = {
.name = "tsc2005", .name = "tsc2005",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = &tsc2005_pm_ops,
}, },
#ifdef CONFIG_PM
.suspend = tsc2005_suspend,
.resume = tsc2005_resume,
#endif
.probe = tsc2005_probe, .probe = tsc2005_probe,
.remove = __devexit_p(tsc2005_remove), .remove = __devexit_p(tsc2005_remove),
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment