lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Input: ad7879 - convert I2C to dev_pm_ops

Browse Source 
There is a general move towards the use of dev_pm_ops rather than
bus specific suspend APIs as this simplifies both the bus and PM core
implementations. Convert the ad7879-ts I2C support over.

Compile tested only.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Mark Brown
2011-01-06 23:01:02 -08:00
committed by Dmitry Torokhov
parent a6d38f8897
commit d5dc9ac3f6
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,14 +10,16 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/pm.h>
#include "ad7879.h" #include "ad7879.h"
#define AD7879_DEVID 0x79 /* AD7879-1/AD7889-1 */ #define AD7879_DEVID 0x79 /* AD7879-1/AD7889-1 */
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int ad7879_i2c_suspend(struct i2c_client *client, pm_message_t message) static int ad7879_i2c_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev);
struct ad7879 *ts = i2c_get_clientdata(client); struct ad7879 *ts = i2c_get_clientdata(client);
ad7879_suspend(ts); ad7879_suspend(ts);
@@ -25,17 +27,17 @@ static int ad7879_i2c_suspend(struct i2c_client *client, pm_message_t message)
return 0; return 0;
} }
static int ad7879_i2c_resume(struct i2c_client *client) static int ad7879_i2c_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev);
struct ad7879 *ts = i2c_get_clientdata(client); struct ad7879 *ts = i2c_get_clientdata(client);
ad7879_resume(ts); ad7879_resume(ts);
return 0; return 0;
} }
#else
# define ad7879_i2c_suspend NULL static SIMPLE_DEV_PM_OPS(ad7879_i2c_pm, ad7879_i2c_suspend, ad7879_i2c_resume);
# define ad7879_i2c_resume NULL
#endif #endif
/* All registers are word-sized. /* All registers are word-sized.
@@ -117,11 +119,12 @@ static struct i2c_driver ad7879_i2c_driver = {
.driver = { .driver = {
.name = "ad7879", .name = "ad7879",
.owner = THIS_MODULE, .owner = THIS_MODULE,
#ifdef CONFIG_PM
.pm = &ad7879_i2c_pm,
#endif
}, },
.probe = ad7879_i2c_probe, .probe = ad7879_i2c_probe,
.remove = __devexit_p(ad7879_i2c_remove), .remove = __devexit_p(ad7879_i2c_remove),
.suspend = ad7879_i2c_suspend,
.resume = ad7879_i2c_resume,
.id_table = ad7879_id, .id_table = ad7879_id,
}; };