Commit 3cd4291a authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds

backlight: adp8870: convert adp8870 to dev_pm_ops

Instead of using legacy suspend/resume methods, using newer dev_pm_ops
structure allows better control over power management.
Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cf108b5c
...@@ -947,25 +947,29 @@ static int adp8870_remove(struct i2c_client *client) ...@@ -947,25 +947,29 @@ static int adp8870_remove(struct i2c_client *client)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int adp8870_i2c_suspend(struct i2c_client *client, pm_message_t message) static int adp8870_i2c_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev);
adp8870_clr_bits(client, ADP8870_MDCR, NSTBY); adp8870_clr_bits(client, ADP8870_MDCR, NSTBY);
return 0; return 0;
} }
static int adp8870_i2c_resume(struct i2c_client *client) static int adp8870_i2c_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev);
adp8870_set_bits(client, ADP8870_MDCR, NSTBY | BLEN); adp8870_set_bits(client, ADP8870_MDCR, NSTBY | BLEN);
return 0; return 0;
} }
#else
#define adp8870_i2c_suspend NULL
#define adp8870_i2c_resume NULL
#endif #endif
static SIMPLE_DEV_PM_OPS(adp8870_i2c_pm_ops, adp8870_i2c_suspend,
adp8870_i2c_resume);
static const struct i2c_device_id adp8870_id[] = { static const struct i2c_device_id adp8870_id[] = {
{ "adp8870", 0 }, { "adp8870", 0 },
{ } { }
...@@ -974,12 +978,11 @@ MODULE_DEVICE_TABLE(i2c, adp8870_id); ...@@ -974,12 +978,11 @@ MODULE_DEVICE_TABLE(i2c, adp8870_id);
static struct i2c_driver adp8870_driver = { static struct i2c_driver adp8870_driver = {
.driver = { .driver = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.pm = &adp8870_i2c_pm_ops,
}, },
.probe = adp8870_probe, .probe = adp8870_probe,
.remove = adp8870_remove, .remove = adp8870_remove,
.suspend = adp8870_i2c_suspend,
.resume = adp8870_i2c_resume,
.id_table = adp8870_id, .id_table = adp8870_id,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment