diff options
Diffstat (limited to 'drivers/input/touchscreen/ad7879-spi.c')
-rw-r--r-- | drivers/input/touchscreen/ad7879-spi.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/drivers/input/touchscreen/ad7879-spi.c b/drivers/input/touchscreen/ad7879-spi.c index b1643c8fa7c9..8f391ffbf441 100644 --- a/drivers/input/touchscreen/ad7879-spi.c +++ b/drivers/input/touchscreen/ad7879-spi.c | |||
@@ -22,30 +22,6 @@ | |||
22 | #define AD7879_WRITECMD(reg) (AD7879_CMD(reg)) | 22 | #define AD7879_WRITECMD(reg) (AD7879_CMD(reg)) |
23 | #define AD7879_READCMD(reg) (AD7879_CMD(reg) | AD7879_CMD_READ) | 23 | #define AD7879_READCMD(reg) (AD7879_CMD(reg) | AD7879_CMD_READ) |
24 | 24 | ||
25 | #ifdef CONFIG_PM_SLEEP | ||
26 | static int ad7879_spi_suspend(struct device *dev) | ||
27 | { | ||
28 | struct spi_device *spi = to_spi_device(dev); | ||
29 | struct ad7879 *ts = spi_get_drvdata(spi); | ||
30 | |||
31 | ad7879_suspend(ts); | ||
32 | |||
33 | return 0; | ||
34 | } | ||
35 | |||
36 | static int ad7879_spi_resume(struct device *dev) | ||
37 | { | ||
38 | struct spi_device *spi = to_spi_device(dev); | ||
39 | struct ad7879 *ts = spi_get_drvdata(spi); | ||
40 | |||
41 | ad7879_resume(ts); | ||
42 | |||
43 | return 0; | ||
44 | } | ||
45 | #endif | ||
46 | |||
47 | static SIMPLE_DEV_PM_OPS(ad7879_spi_pm, ad7879_spi_suspend, ad7879_spi_resume); | ||
48 | |||
49 | /* | 25 | /* |
50 | * ad7879_read/write are only used for initial setup and for sysfs controls. | 26 | * ad7879_read/write are only used for initial setup and for sysfs controls. |
51 | * The main traffic is done in ad7879_collect(). | 27 | * The main traffic is done in ad7879_collect(). |
@@ -176,7 +152,7 @@ static struct spi_driver ad7879_spi_driver = { | |||
176 | .name = "ad7879", | 152 | .name = "ad7879", |
177 | .bus = &spi_bus_type, | 153 | .bus = &spi_bus_type, |
178 | .owner = THIS_MODULE, | 154 | .owner = THIS_MODULE, |
179 | .pm = &ad7879_spi_pm, | 155 | .pm = &ad7879_pm_ops, |
180 | }, | 156 | }, |
181 | .probe = ad7879_spi_probe, | 157 | .probe = ad7879_spi_probe, |
182 | .remove = __devexit_p(ad7879_spi_remove), | 158 | .remove = __devexit_p(ad7879_spi_remove), |