git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Input: ad714x-i2c - convert to dev_pm_ops
[pandora-kernel.git]
/
drivers
/
input
/
misc
/
ad714x-i2c.c
diff --git
a/drivers/input/misc/ad714x-i2c.c
b/drivers/input/misc/ad714x-i2c.c
index
2bef8fa
..
e21deb1
100644
(file)
--- a/
drivers/input/misc/ad714x-i2c.c
+++ b/
drivers/input/misc/ad714x-i2c.c
@@
-10,23
+10,23
@@
#include <linux/i2c.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/i2c.h>
#include <linux/module.h>
#include <linux/types.h>
+#include <linux/pm.h>
#include "ad714x.h"
#ifdef CONFIG_PM
#include "ad714x.h"
#ifdef CONFIG_PM
-static int ad714x_i2c_suspend(struct
i2c_client *client, pm_message_t message
)
+static int ad714x_i2c_suspend(struct
device *dev
)
{
{
- return ad714x_disable(i2c_get_clientdata(
client
));
+ return ad714x_disable(i2c_get_clientdata(
to_i2c_client(dev)
));
}
}
-static int ad714x_i2c_resume(struct
i2c_client *client
)
+static int ad714x_i2c_resume(struct
device *dev
)
{
{
- return ad714x_enable(i2c_get_clientdata(
client
));
+ return ad714x_enable(i2c_get_clientdata(
to_i2c_client(dev)
));
}
}
-#else
-# define ad714x_i2c_suspend NULL
-# define ad714x_i2c_resume NULL
#endif
#endif
+static SIMPLE_DEV_PM_OPS(ad714x_i2c_pm, ad714x_i2c_suspend, ad714x_i2c_resume);
+
static int ad714x_i2c_write(struct device *dev, unsigned short reg,
unsigned short data)
{
static int ad714x_i2c_write(struct device *dev, unsigned short reg,
unsigned short data)
{
@@
-114,11
+114,10
@@
MODULE_DEVICE_TABLE(i2c, ad714x_id);
static struct i2c_driver ad714x_i2c_driver = {
.driver = {
.name = "ad714x_captouch",
static struct i2c_driver ad714x_i2c_driver = {
.driver = {
.name = "ad714x_captouch",
+ .pm = &ad714x_i2c_pm,
},
.probe = ad714x_i2c_probe,
.remove = __devexit_p(ad714x_i2c_remove),
},
.probe = ad714x_i2c_probe,
.remove = __devexit_p(ad714x_i2c_remove),
- .suspend = ad714x_i2c_suspend,
- .resume = ad714x_i2c_resume,
.id_table = ad714x_id,
};
.id_table = ad714x_id,
};