power: ds2782_battery: Use dev_pm_ops
PATCH 1/5 power: ds2782_battery: Use dev_pm_ops
Use dev_pm_ops instead of the deprecated legacy suspend/resume callbacks.
--- drivers/power/ds2782_battery.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/power/ds2782_battery.c +11 -11
@@ -332,31 +332,32 @@ static int ds278x_battery_remove(struct i2c_client *client)return 0 ; } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP -static int ds278x_suspend (struct i2c_client *client, -pm_message_t state) +static int ds278x_suspend (struct device *dev) { +struct i2c_client *client =to_i2c_client (dev);struct ds278x_info *info =i2c_get_clientdata (client);cancel_delayed_work (&info->bat_work);return 0 ; } -static int ds278x_resume (struct i2c_client *client) +static int ds278x_resume (struct device *dev) { +struct i2c_client *client =to_i2c_client (dev);struct ds278x_info *info =i2c_get_clientdata (client);schedule_delayed_work (&info->bat_work, DS278x_DELAY);return 0 ; } -#else - -#define ds278x_suspend NULL -#define ds278x_resume NULL +static SIMPLE_DEV_PM_OPS(ds278x_battery_pm_ops, ds278x_suspend, ds278x_resume); +#define DS278X_BATTERY_PM_OPS (&ds278x_battery_pm_ops) -#endif /* CONFIG_PM */ +#else +#define DS278X_BATTERY_PM_OPS NULL +#endif /* CONFIG_PM_SLEEP */ enum ds278x_num_id {
@@ -465,11 +466,10 @@ MODULE_DEVICE_TABLE(i2c, ds278x_id);static struct i2c_driver ds278x_battery_driver = { .driver = { .name ="ds2782-battery" , + .pm =DS278X_BATERY_PM_OPS , }, .probe = ds278x_battery_probe, .remove = ds278x_battery_remove, - .suspend = ds278x_suspend, - .resume = ds278x_resume, .id_table = ds278x_id, };module_i2c_driver (ds278x_battery_driver);
Signature · 1 line
1.8.0
PATCH 2/5 power: max17040_battery: Use dev_pm_ops
Use dev_pm_ops instead of the deprecated legacy suspend/resume callbacks.
--- drivers/power/max17040_battery.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/power/max17040_battery.c +12 -9
@@ -246,31 +246,34 @@ static int max17040_remove(struct i2c_client *client)return 0 ; } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP -static int max17040_suspend (struct i2c_client *client, -pm_message_t state) +static int max17040_suspend (struct device *dev) { +struct i2c_client *client =to_i2c_client (dev);struct max17040_chip *chip =i2c_get_clientdata (client);cancel_delayed_work (&chip->work);return 0 ; } -static int max17040_resume (struct i2c_client *client) +static int max17040_resume (struct device *dev) { +struct i2c_client *client =to_i2c_client (dev);struct max17040_chip *chip =i2c_get_clientdata (client);schedule_delayed_work (&chip->work,MAX17040_DELAY );return 0 ; } +static SIMPLE_DEV_PM_OPS(max17040_pm_ops, max17040_suspend, max17040_resume); +#define MAX17040_PM_OPS (&max17040_pm_ops) +#else -#define max17040_suspend NULL -#define max17040_resume NULL +#define MAX17040_PM_OPS NULL -#endif /* CONFIG_PM */ +#endif /* CONFIG_PM_SLEEP */ static const struct i2c_device_id max17040_id[] = { {"max17040" ,0 },
@@ -278,14 +281,14 @@ static const struct i2c_device_id max17040_id[] = { };MODULE_DEVICE_TABLE (i2c, max17040_id); +static struct i2c_driver max17040_i2c_driver = { .driver = { .name ="max17040" , + .pm =MAX17040_PM_OPS , }, .probe = max17040_probe, .remove = max17040_remove, - .suspend = max17040_suspend, - .resume = max17040_resume, .id_table = max17040_id, };module_i2c_driver (max17040_i2c_driver);
Signature · 1 line
1.8.0
Re: [PATCH 2/5] power: max17040_battery: Use dev_pm_ops
Quoted 8 lines · Lars-Peter Clausen
Use
dev_pm_opsinstead of the deprecated legacy suspend/resume callbacks.Cc Minkyu Kang <[email protected]>Signed-off-by Lars-Peter Clausen <[email protected]>--- drivers/power/max17040_battery.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
Thanks,
Minkyu Kang.
Re: [PATCH 2/5] power: max17040_battery: Use dev_pm_ops
In reply to Lars-Peter ClausenQuoted 5 lines · Lars-Peter Clausen
Use
dev_pm_opsinstead of the deprecated legacy suspend/resume callbacks.Cc Minkyu Kang <[email protected]>Signed-off-by Lars-Peter Clausen <[email protected]>---
Patches 1-3 applied, thanks a lot!
[...]
drivers/power/max17040_battery.c static const struct i2c_device_id max17040_id[] = { · line 284
Quoted 5 lines
drivers/power/max17040_battery.c +1
-0@@ -278,14 +281,14 @@ static const struct i2c_device_id max17040_id[] = { };MODULE_DEVICE_TABLE (i2c, max17040_id); +
(Stray new line...)
Quoted 14 lines
drivers/power/max17040_battery.c +1
-2static struct i2c_driver max17040_i2c_driver = { .driver = { .name ="max17040" , + .pm =MAX17040_PM_OPS , }, .probe = max17040_probe, .remove = max17040_remove, - .suspend = max17040_suspend, - .resume = max17040_resume, .id_table = max17040_id, };module_i2c_driver (max17040_i2c_driver);Signature · 1 line
1.8.0
PATCH 3/5 power: sbs-battery: Use dev_pm_ops
In reply to Lars-Peter ClausenUse dev_pm_ops instead of the deprecated legacy suspend/resume callbacks.
--- drivers/power/sbs-battery.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/power/sbs-battery.c +10 -8
@@ -820,10 +820,11 @@ static int sbs_remove(struct i2c_client *client)return 0 ; } -#if definedCONFIG_PM -static int sbs_suspend (struct i2c_client *client, -pm_message_t state) +#if definedCONFIG_PM_SLEEP + +static int sbs_suspend (struct device *dev) { +struct i2c_client *client =to_i2c_client (dev);struct sbs_info *chip =i2c_get_clientdata (client);s32 ret;
@@ -838,11 +839,13 @@ static int sbs_suspend(struct i2c_client *client,return 0 ; } + +static SIMPLE_DEV_PM_OPS(sbs_pm_ops, sbs_suspend, NULL); +#define SBS_PM_OPS (&sbs_pm_ops) +#else -#define sbs_suspend NULL +#define SBS_PM_OPS NULL#endif -/* any smbus transaction will wake up sbs */ -#define sbs_resume NULLstatic const struct i2c_device_id sbs_id[] = { {"bq20z75" ,0 },
@@ -854,12 +857,11 @@ MODULE_DEVICE_TABLE(i2c, sbs_id);static struct i2c_driver sbs_battery_driver = { .probe = sbs_probe, .remove = sbs_remove, - .suspend = sbs_suspend, - .resume = sbs_resume, .id_table = sbs_id, .driver = { .name ="sbs-battery" , .of_match_table = sbs_dt_ids, + .pm =SBS_PM_OPS , }, };module_i2c_driver (sbs_battery_driver);
Signature · 1 line
1.8.0
Re: [PATCH 3/5] power: sbs-battery: Use dev_pm_ops
Quoted 48 lines · Lars-Peter Clausen
Use
dev_pm_opsinstead of the deprecated legacy suspend/resume callbacks.Cc Rhyland Klein <[email protected]>Signed-off-by Lars-Peter Clausen <[email protected]>--- drivers/power/sbs-battery.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)drivers/power/sbs-battery.c +9
-6@@ -820,10 +820,11 @@ static int sbs_remove(struct i2c_client *client)return 0 ; } -#if definedCONFIG_PM -static int sbs_suspend (struct i2c_client *client, -pm_message_t state) +#if definedCONFIG_PM_SLEEP + +static int sbs_suspend (struct device *dev) { +struct i2c_client *client =to_i2c_client (dev);struct sbs_info *chip =i2c_get_clientdata (client);s32 ret;@@ -838,11 +839,13 @@ static int sbs_suspend(struct i2c_client *client,return 0 ; } + +static SIMPLE_DEV_PM_OPS(sbs_pm_ops, sbs_suspend, NULL); +#define SBS_PM_OPS (&sbs_pm_ops) +#else -#define sbs_suspend NULL +#define SBS_PM_OPS NULL#endif -/* any smbus transaction will wake up sbs */ -#define sbs_resume NULLstatic const struct i2c_device_id sbs_id[] = { {"bq20z75" ,0 },@@ -854,12 +857,11 @@ MODULE_DEVICE_TABLE(i2c, sbs_id);static struct i2c_driver sbs_battery_driver = { .probe = sbs_probe, .remove = sbs_remove,
drivers/power/sbs-battery.c MODULE_DEVICE_TABLE(i2c, sbs_id); · line 867
Quoted 10 lines
drivers/power/sbs-battery.c +1
-2- .suspend = sbs_suspend, - .resume = sbs_resume, .id_table = sbs_id, .driver = { .name = "sbs-battery", .of_match_table = sbs_dt_ids, + .pm = SBS_PM_OPS, }, };module_i2c_driver (sbs_battery_driver);
Looks got to me!
Acked-By Rhyland Klein <[email protected]>
Signature · 1 line
nvpublic
PATCH 4/5 power: pm2301_charger: Remove __dev* annotations
In reply to Lars-Peter ClausenThe removal of __devinit and friends seems to have overlapped with the addition of the pm2301_charger driver. Currently the driver fails to build with the following errors:
drivers/power/pm2301_charger.c:843:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'pm2xxx_wall_charger_probe' drivers/power/pm2301_charger.c:1013:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'pm2xxx_wall_charger_remove' drivers/power/pm2301_charger.c:1049:11: error: 'pm2xxx_wall_charger_probe' undeclared here (not in a function) drivers/power/pm2301_charger.c:1050:2: error: implicit declaration of function '__devexit_p' drivers/power/pm2301_charger.c:1050:24: error: 'pm2xxx_wall_charger_remove' undeclared here (not in a function)
This patch removes the __dev* annotations, which fixes the build errors.
--- drivers/power/pm2301_charger.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/power/pm2301_charger.c +3 -3
@@ -851,7 +851,7 @@ static int pm2xxx_wall_charger_suspend(struct i2c_client *i2c_client,return 0 ; } -static int __devinit pm2xxx_wall_charger_probe (struct i2c_client *i2c_client, +static int pm2xxx_wall_charger_probe (struct i2c_client *i2c_client,const struct i2c_device_id *id) {struct pm2xxx_platform_data *pl_data = i2c_client->dev.platform_data;
@@ -1021,7 +1021,7 @@ free_device_info:return ret; } -static int __devexit pm2xxx_wall_charger_remove(struct i2c_client *i2c_client) +static int pm2xxx_wall_charger_remove (struct i2c_client *i2c_client) {struct pm2xxx_charger *pm2 =i2c_get_clientdata (i2c_client);
@@ -1058,7 +1058,7 @@ MODULE_DEVICE_TABLE(i2c, pm2xxx_id);static struct i2c_driver pm2xxx_charger_driver = { .probe = pm2xxx_wall_charger_probe, - .remove =__devexit_p (pm2xxx_wall_charger_remove), + .remove = pm2xxx_wall_charger_remove, .suspend = pm2xxx_wall_charger_suspend, .resume = pm2xxx_wall_charger_resume, .driver = {
Signature · 1 line
1.8.0
Anton Vorontsov
AppliedRe: [PATCH 4/5] power: pm2301_charger: Remove __dev* annotations
Quoted 10 lines · Lars-Peter Clausen
The removal of
__devinitand friends seems to have overlapped with the addition of thepm2301_chargerdriver. Currently the driver fails to build with the following errors:
drivers/power/pm2301_charger.c:843:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'pm2xxx_wall_charger_probe'drivers/power/pm2301_charger.c:1013:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'pm2xxx_wall_charger_remove'drivers/power/pm2301_charger.c:1049:11: error: 'pm2xxx_wall_charger_probe' undeclared here (not in a function)drivers/power/pm2301_charger.c:1050:2: error: implicit declaration of function '__devexit_p'drivers/power/pm2301_charger.c:1050:24: error: 'pm2xxx_wall_charger_remove' undeclared here (not in a function)
Quoted 4 lines
This patch removes the __dev* annotations, which fixes the build errors.
Cc Lee Jones <[email protected]>Signed-off-by Lars-Peter Clausen <[email protected]>
Applied to battery-urgent.git, thanks a lot!
Quoted 39 lines
--- drivers/power/pm2301_charger.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/power/pm2301_charger.c +3
-3@@ -851,7 +851,7 @@ static int pm2xxx_wall_charger_suspend(struct i2c_client *i2c_client,return 0 ; } -static int __devinit pm2xxx_wall_charger_probe (struct i2c_client *i2c_client, +static int pm2xxx_wall_charger_probe (struct i2c_client *i2c_client,const struct i2c_device_id *id) {struct pm2xxx_platform_data *pl_data = i2c_client->dev.platform_data;@@ -1021,7 +1021,7 @@ free_device_info:return ret; } -static int __devexit pm2xxx_wall_charger_remove(struct i2c_client *i2c_client) +static int pm2xxx_wall_charger_remove (struct i2c_client *i2c_client) {struct pm2xxx_charger *pm2 =i2c_get_clientdata (i2c_client);@@ -1058,7 +1058,7 @@ MODULE_DEVICE_TABLE(i2c, pm2xxx_id);static struct i2c_driver pm2xxx_charger_driver = { .probe = pm2xxx_wall_charger_probe, - .remove =__devexit_p (pm2xxx_wall_charger_remove), + .remove = pm2xxx_wall_charger_remove, .suspend = pm2xxx_wall_charger_suspend, .resume = pm2xxx_wall_charger_resume, .driver = {Signature · 1 line
1.8.0
PATCH 5/5 power: pm2301_charger: Remove no-op suspend/resume callbacks
In reply to Lars-Peter ClausenHaving suspend/resume callbacks which do nothing other then return 0 are functional equivalent to having no suspend/resume callbacks. So just remove these no-op suspend/resume callbacks.
--- drivers/power/pm2301_charger.c | 13 ------------- 1 file changed, 13 deletions(-)
drivers/power/pm2301_charger.c +0 -13
@@ -840,17 +840,6 @@ static struct pm2xxx_irq pm2xxx_charger_irq[] = { {"PM2XXX_IRQ_INT", pm2xxx_irq_int}, }; -static int pm2xxx_wall_charger_resume (struct i2c_client *i2c_client) -{ -return 0 ; -} - -static int pm2xxx_wall_charger_suspend (struct i2c_client *i2c_client, -pm_message_t state) -{ -return 0 ; -} -static int pm2xxx_wall_charger_probe (struct i2c_client *i2c_client,const struct i2c_device_id *id) {
@@ -1059,8 +1048,6 @@ MODULE_DEVICE_TABLE(i2c, pm2xxx_id);static struct i2c_driver pm2xxx_charger_driver = { .probe = pm2xxx_wall_charger_probe, .remove = pm2xxx_wall_charger_remove, - .suspend = pm2xxx_wall_charger_suspend, - .resume = pm2xxx_wall_charger_resume, .driver = { .name ="pm2xxx-wall_charger" , .owner =THIS_MODULE ,
Signature · 1 line
1.8.0
Quoted 5 lines · Lars-Peter Clausen
Use
dev_pm_opsinstead of the deprecated legacy suspend/resume callbacks.Cc Evgeny Romanov <[email protected]>Signed-off-by Lars-Peter Clausen <[email protected]>---
[...]
drivers/power/ds2782_battery.c MODULE_DEVICE_TABLE(i2c, ds278x_id); · line 469
Quoted 5 lines
drivers/power/ds2782_battery.c +1
-0@@ -465,11 +466,10 @@ MODULE_DEVICE_TABLE(i2c, ds278x_id);static struct i2c_driver ds278x_battery_driver = { .driver = { .name ="ds2782-battery" , + .pm =DS278X_BATERY_PM_OPS ,
Typo: BATTERY.
CHECK drivers/power/ds2782_battery.cdrivers/power/ds2782_battery.c:464:27: error: undefined identifier 'DS278X_BATERY_PM_OPS'
CC drivers/power/ds2782_battery.odrivers/power/ds2782_battery.c:464:9: error: ‘DS278X_BATERY_PM_OPS’ undeclared here (not in a function) make[1]: *** [drivers/power/ds2782_battery.o] Error 1
I fixed it up and applied the patch...
Thanks,
Anton
Quoted 8 lines
drivers/power/ds2782_battery.c +0
-2}, .probe = ds278x_battery_probe, .remove = ds278x_battery_remove, - .suspend = ds278x_suspend, - .resume = ds278x_resume, .id_table = ds278x_id, };module_i2c_driver (ds278x_battery_driver);