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

Input: ad714x-spi - convert to dev_pm_ops

Browse Source 
There is a general move to convert drivers to use dev_pm_ops rather than
bus specific PM operations in order to facilitate core work. Do this
conversion for ad714x-spi.

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-02-11 08:49:37 -08:00 committed by Dmitry Torokhov
parent 6b7cfd193a
commit a257090cd4
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/input/misc/ad714x-spi.c
View File

@ -9,6 +9,7 @@
#include <linux/input.h> /* BUS_I2C */ #include <linux/input.h> /* BUS_I2C */
#include <linux/module.h> #include <linux/module.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/pm.h>
#include <linux/types.h> #include <linux/types.h>
#include "ad714x.h" #include "ad714x.h"
@ -16,20 +17,19 @@
#define AD714x_SPI_READ BIT(10) #define AD714x_SPI_READ BIT(10)
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int ad714x_spi_suspend(struct spi_device *spi, pm_message_t message) static int ad714x_spi_suspend(struct device *dev)
{ {
return ad714x_disable(spi_get_drvdata(spi)); return ad714x_disable(spi_get_drvdata(to_spi_device(dev)));
} }
static int ad714x_spi_resume(struct spi_device *spi) static int ad714x_spi_resume(struct device *dev)
{ {
return ad714x_enable(spi_get_drvdata(spi)); return ad714x_enable(spi_get_drvdata(to_spi_device(dev)));
} }
#else
# define ad714x_spi_suspend NULL
# define ad714x_spi_resume NULL
#endif #endif
static SIMPLE_DEV_PM_OPS(ad714x_spi_pm, ad714x_spi_suspend, ad714x_spi_resume);
static int ad714x_spi_read(struct device *dev, unsigned short reg, static int ad714x_spi_read(struct device *dev, unsigned short reg,
unsigned short *data) unsigned short *data)
{ {
@ -79,11 +79,10 @@ static struct spi_driver ad714x_spi_driver = {
.driver = { .driver = {
.name = "ad714x_captouch", .name = "ad714x_captouch",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = &ad714x_spi_pm,
}, },
.probe = ad714x_spi_probe, .probe = ad714x_spi_probe,
.remove = __devexit_p(ad714x_spi_remove), .remove = __devexit_p(ad714x_spi_remove),
.suspend = ad714x_spi_suspend,
.resume = ad714x_spi_resume,
}; };
static __init int ad714x_spi_init(void) static __init int ad714x_spi_init(void)