projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
misc
/
tsl2550.c
diff --git
a/drivers/misc/tsl2550.c
b/drivers/misc/tsl2550.c
index 1e7bc0eb081ed441a13925e1c7f0a8a4967a2d79..1dfde4d543dbeef4526569f4fd6e201e3e2877ea 100644
(file)
--- a/
drivers/misc/tsl2550.c
+++ b/
drivers/misc/tsl2550.c
@@
-417,24
+417,26
@@
static int tsl2550_remove(struct i2c_client *client)
return 0;
}
return 0;
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
-static int tsl2550_suspend(struct
i2c_client *client, pm_message_t mesg
)
+static int tsl2550_suspend(struct
device *dev
)
{
{
- return tsl2550_set_power_state(
client
, 0);
+ return tsl2550_set_power_state(
to_i2c_client(dev)
, 0);
}
}
-static int tsl2550_resume(struct
i2c_client *client
)
+static int tsl2550_resume(struct
device *dev
)
{
{
- return tsl2550_set_power_state(
client
, 1);
+ return tsl2550_set_power_state(
to_i2c_client(dev)
, 1);
}
}
+static SIMPLE_DEV_PM_OPS(tsl2550_pm_ops, tsl2550_suspend, tsl2550_resume);
+#define TSL2550_PM_OPS (&tsl2550_pm_ops)
+
#else
#else
-#define tsl2550_suspend NULL
-#define tsl2550_resume NULL
+#define TSL2550_PM_OPS NULL
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM
_SLEEP
*/
static const struct i2c_device_id tsl2550_id[] = {
{ "tsl2550", 0 },
static const struct i2c_device_id tsl2550_id[] = {
{ "tsl2550", 0 },
@@
-446,9
+448,8
@@
static struct i2c_driver tsl2550_driver = {
.driver = {
.name = TSL2550_DRV_NAME,
.owner = THIS_MODULE,
.driver = {
.name = TSL2550_DRV_NAME,
.owner = THIS_MODULE,
+ .pm = TSL2550_PM_OPS,
},
},
- .suspend = tsl2550_suspend,
- .resume = tsl2550_resume,
.probe = tsl2550_probe,
.remove = tsl2550_remove,
.id_table = tsl2550_id,
.probe = tsl2550_probe,
.remove = tsl2550_remove,
.id_table = tsl2550_id,