android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input: ad7879 - convert SPI to dev_pm_ops

Browse Source 
There is a move to deprecate bus-specific PM operations and move to
using dev_pm_ops instead in order to reduce the amount of boilerplate
code in buses and facilitate updates to the PM core. Do this move for
the ad7879 SPI driver.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Michael Hennerich <Michael.Hennerich@analog.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Mark Brown 2011-01-20 22:48:44 -08:00 committed by Dmitry Torokhov
parent fccdd7c4ae
commit c7848c8e1a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/input/touchscreen/ad7879-spi.c
View File

@ -7,6 +7,7 @@
*/ */
#include <linux/input.h> /* BUS_SPI */ #include <linux/input.h> /* BUS_SPI */
#include <linux/pm.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include "ad7879.h" #include "ad7879.h"
@ -20,9 +21,10 @@
#define AD7879_WRITECMD(reg) (AD7879_CMD(reg)) #define AD7879_WRITECMD(reg) (AD7879_CMD(reg))
#define AD7879_READCMD(reg) (AD7879_CMD(reg) | AD7879_CMD_READ) #define AD7879_READCMD(reg) (AD7879_CMD(reg) | AD7879_CMD_READ)
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int ad7879_spi_suspend(struct spi_device *spi, pm_message_t message) static int ad7879_spi_suspend(struct device *dev)
{ {
struct spi_device *spi = to_spi_device(dev);
struct ad7879 *ts = spi_get_drvdata(spi); struct ad7879 *ts = spi_get_drvdata(spi);
ad7879_suspend(ts); ad7879_suspend(ts);
@ -30,19 +32,19 @@ static int ad7879_spi_suspend(struct spi_device *spi, pm_message_t message)
return 0; return 0;
} }
static int ad7879_spi_resume(struct spi_device *spi) static int ad7879_spi_resume(struct device *dev)
{ {
struct spi_device *spi = to_spi_device(dev);
struct ad7879 *ts = spi_get_drvdata(spi); struct ad7879 *ts = spi_get_drvdata(spi);
ad7879_resume(ts); ad7879_resume(ts);
return 0; return 0;
} }
#else
# define ad7879_spi_suspend NULL
# define ad7879_spi_resume NULL
#endif #endif
static SIMPLE_DEV_PM_OPS(ad7879_spi_pm, ad7879_spi_suspend, ad7879_spi_resume);
/* /*
* ad7879_read/write are only used for initial setup and for sysfs controls. * ad7879_read/write are only used for initial setup and for sysfs controls.
* The main traffic is done in ad7879_collect(). * The main traffic is done in ad7879_collect().
@ -173,11 +175,10 @@ static struct spi_driver ad7879_spi_driver = {
.name = "ad7879", .name = "ad7879",
.bus = &spi_bus_type, .bus = &spi_bus_type,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = &ad7879_spi_pm,
}, },
.probe = ad7879_spi_probe, .probe = ad7879_spi_probe,
.remove = __devexit_p(ad7879_spi_remove), .remove = __devexit_p(ad7879_spi_remove),
.suspend = ad7879_spi_suspend,
.resume = ad7879_spi_resume,
}; };
static int __init ad7879_spi_init(void) static int __init ad7879_spi_init(void)