Skip to content

Commit

Permalink
Input: tsc2005 - convert to using dev_pm_ops
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dmitry Torokhov committed Mar 17, 2011
1 parent 6b007d6 commit 3ff8ff5
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions drivers/input/touchscreen/tsc2005.c
Original file line number Diff line number Diff line change
@@ -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)

0 comments on commit 3ff8ff5

Please sign in to comment.