regulator: 88pm8607: Convert to devm_regulator_register
Subsystems (3)
PATCH 1/8 regulator: 88pm8607: Convert to devm_regulator_register
Signed-off-by Axel Lin <[email protected]>
--- drivers/regulator/88pm8607.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/regulator/88pm8607.c +2 -10
@@ -391,7 +391,8 @@ static int pm8607_regulator_probe(struct platform_device *pdev)else config.regmap = chip->regmap_companion; - info->regulator =regulator_register (&info->desc, &config); + info->regulator =devm_regulator_register (&pdev->dev, &info->desc, + &config);if (IS_ERR (info->regulator)) {dev_err (&pdev->dev,"failed to register regulator %s\n" , info->desc.name);
@@ -402,14 +403,6 @@ static int pm8607_regulator_probe(struct platform_device *pdev)return 0 ; } -static int pm8607_regulator_remove (struct platform_device *pdev) -{ -struct pm8607_regulator_info *info =platform_get_drvdata (pdev); - -regulator_unregister (info->regulator); -return 0 ; -} -static struct platform_device_id pm8607_regulator_driver_ids[] = { { .name ="88pm860x-regulator" ,
@@ -428,7 +421,6 @@ static struct platform_driver pm8607_regulator_driver = { .owner = THIS_MODULE, }, .probe = pm8607_regulator_probe, - .remove = pm8607_regulator_remove, .id_table = pm8607_regulator_driver_ids, };
Signature · 1 line
1.8.1.2
PATCH 2/8 regulator: aat2870: Convert to devm_regulator_register
Signed-off-by Axel Lin <[email protected]>
--- drivers/regulator/aat2870-regulator.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/regulator/aat2870-regulator.c +1 -10
@@ -176,7 +176,7 @@ static int aat2870_regulator_probe(struct platform_device *pdev) config.driver_data = ri; config.init_data = pdev->dev.platform_data; - rdev =regulator_register (&ri->desc, &config); + rdev =devm_regulator_register (&pdev->dev, &ri->desc, &config);if (IS_ERR (rdev)) {dev_err (&pdev->dev,"Failed to register regulator %s\n" , ri->desc.name);
@@ -187,21 +187,12 @@ static int aat2870_regulator_probe(struct platform_device *pdev)return 0 ; } -static int aat2870_regulator_remove (struct platform_device *pdev) -{ -struct regulator_dev *rdev =platform_get_drvdata (pdev); - -regulator_unregister (rdev); -return 0 ; -} -static struct platform_driver aat2870_regulator_driver = { .driver = { .name ="aat2870-regulator" , .owner =THIS_MODULE , }, .probe = aat2870_regulator_probe, - .remove = aat2870_regulator_remove, };static int __init aat2870_regulator_init (void )
Signature · 1 line
1.8.1.2
Re: [PATCH 2/8] regulator: aat2870: Convert to devm_regulator_register
Acked-by Jinyoung Park <[email protected]>
Quoted 40 lines · Axel Lin
Signed-off-by Axel Lin <[email protected]>--- drivers/regulator/aat2870-regulator.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)drivers/regulator/aat2870-regulator.c +1
-10@@ -176,7 +176,7 @@ static int aat2870_regulator_probe(struct platform_device *pdev) config.driver_data = ri; config.init_data = pdev->dev.platform_data; - rdev =regulator_register (&ri->desc, &config); + rdev =devm_regulator_register (&pdev->dev, &ri->desc, &config);if (IS_ERR (rdev)) {dev_err (&pdev->dev,"Failed to register regulator %s\n" , ri->desc.name);@@ -187,21 +187,12 @@ static int aat2870_regulator_probe(struct platform_device *pdev)return 0 ; } -static int aat2870_regulator_remove (struct platform_device *pdev) -{ -struct regulator_dev *rdev =platform_get_drvdata (pdev); - -regulator_unregister (rdev); -return 0 ; -} -static struct platform_driver aat2870_regulator_driver = { .driver = { .name ="aat2870-regulator" , .owner =THIS_MODULE , }, .probe = aat2870_regulator_probe, - .remove = aat2870_regulator_remove, };static int __init aat2870_regulator_init (void )
PATCH 3/8 regulator: ad5398: Convert to devm_regulator_register
In reply to Axel LinSigned-off-by Axel Lin <[email protected]>
--- drivers/regulator/ad5398.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-)
drivers/regulator/ad5398.c +3 -16
@@ -219,7 +219,6 @@ static int ad5398_probe(struct i2c_client *client,struct ad5398_chip_info *chip;const struct ad5398_current_data_format *df = (struct ad5398_current_data_format *)id->driver_data; -int ret;if (!init_data)return -EINVAL ;
@@ -240,33 +239,21 @@ static int ad5398_probe(struct i2c_client *client, chip->current_offset = df->current_offset; chip->current_mask = (chip->current_level -1 ) << chip->current_offset; - chip->rdev =regulator_register (&ad5398_reg, &config); + chip->rdev =devm_regulator_register (&client->dev, &ad5398_reg, + &config);if (IS_ERR (chip->rdev)) { - ret =PTR_ERR (chip->rdev);dev_err (&client->dev,"failed to register %s %s\n" , id->name, ad5398_reg.name); - goto err; +return PTR_ERR (chip->rdev); }i2c_set_clientdata (client, chip);dev_dbg (&client->dev,"%s regulator driver is registered.\n" , id->name);return 0 ; - -err: -return ret; -} - -static int ad5398_remove (struct i2c_client *client) -{ -struct ad5398_chip_info *chip =i2c_get_clientdata (client); - -regulator_unregister (chip->rdev); -return 0 ; }static struct i2c_driver ad5398_driver = { .probe = ad5398_probe, - .remove = ad5398_remove, .driver = { .name ="ad5398" , },
Signature · 1 line
1.8.1.2
PATCH 4/8 regulator: as3711: Convert to devm_regulator_register
In reply to Axel LinSigned-off-by Axel Lin <[email protected]>
--- drivers/regulator/as3711-regulator.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-)
drivers/regulator/as3711-regulator.c +2 -20
@@ -374,33 +374,16 @@ static int as3711_regulator_probe(struct platform_device *pdev) config.regmap = as3711->regmap; config.of_node = of_node[id]; - rdev =regulator_register (&ri->desc, &config); + rdev =devm_regulator_register (&pdev->dev, &ri->desc, &config);if (IS_ERR (rdev)) {dev_err (&pdev->dev,"Failed to register regulator %s\n" , ri->desc.name); - ret =PTR_ERR (rdev); - goto eregreg; +return PTR_ERR (rdev); } reg->rdev = rdev; }platform_set_drvdata (pdev, regs);return 0 ; - -eregreg: -while (--id >=0 ) -regulator_unregister (regs[id].rdev); - -return ret; -} - -static int as3711_regulator_remove (struct platform_device *pdev) -{ -struct as3711_regulator *regs =platform_get_drvdata (pdev); -int id; - -for (id =0 ; id <AS3711_REGULATOR_NUM ; ++id) -regulator_unregister (regs[id].rdev); -return 0 ; }static struct platform_driver as3711_regulator_driver = {
@@ -409,7 +392,6 @@ static struct platform_driver as3711_regulator_driver = { .owner = THIS_MODULE, }, .probe = as3711_regulator_probe, - .remove = as3711_regulator_remove, };static int __init as3711_regulator_init (void )
Signature · 1 line
1.8.1.2
PATCH 5/8 regulator: da903x: Convert to devm_regulator_register
In reply to Axel LinSigned-off-by Axel Lin <[email protected]>
--- drivers/regulator/da903x.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/regulator/da903x.c +1 -10
@@ -488,7 +488,7 @@ static int da903x_regulator_probe(struct platform_device *pdev) config.init_data = pdev->dev.platform_data; config.driver_data = ri; - rdev =regulator_register (&ri->desc, &config); + rdev =devm_regulator_register (&pdev->dev, &ri->desc, &config);if (IS_ERR (rdev)) {dev_err (&pdev->dev,"failed to register regulator %s\n" , ri->desc.name);
@@ -499,21 +499,12 @@ static int da903x_regulator_probe(struct platform_device *pdev)return 0 ; } -static int da903x_regulator_remove (struct platform_device *pdev) -{ -struct regulator_dev *rdev =platform_get_drvdata (pdev); - -regulator_unregister (rdev); -return 0 ; -} -static struct platform_driver da903x_regulator_driver = { .driver = { .name ="da903x-regulator" , .owner =THIS_MODULE , }, .probe = da903x_regulator_probe, - .remove = da903x_regulator_remove, };static int __init da903x_regulator_init (void )
Signature · 1 line
1.8.1.2
PATCH 6/8 regulator: da9052: Convert to devm_regulator_register
In reply to Axel LinSigned-off-by Axel Lin <[email protected]>
--- drivers/regulator/da9052-regulator.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)
drivers/regulator/da9052-regulator.c +3 -11
@@ -389,8 +389,9 @@ static int da9052_regulator_probe(struct platform_device *pdev)#endif } - regulator->rdev =regulator_register (®ulator->info->reg_desc, - &config); + regulator->rdev =devm_regulator_register (&pdev->dev, + ®ulator->info->reg_desc, + &config);if (IS_ERR (regulator->rdev)) {dev_err (&pdev->dev,"failed to register regulator %s\n" , regulator->info->reg_desc.name);
@@ -402,17 +403,8 @@ static int da9052_regulator_probe(struct platform_device *pdev)return 0 ; } -static int da9052_regulator_remove (struct platform_device *pdev) -{ -struct da9052_regulator *regulator =platform_get_drvdata (pdev); - -regulator_unregister (regulator->rdev); -return 0 ; -} -static struct platform_driver da9052_regulator_driver = { .probe = da9052_regulator_probe, - .remove = da9052_regulator_remove, .driver = { .name ="da9052-regulator" , .owner =THIS_MODULE ,
Signature · 1 line
1.8.1.2
PATCH 7/8 regulator: da9055: Convert to devm_regulator_register
In reply to Axel LinSigned-off-by Axel Lin <[email protected]>
--- drivers/regulator/da9055-regulator.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-)
drivers/regulator/da9055-regulator.c +5 -19
@@ -564,13 +564,13 @@ static int da9055_regulator_probe(struct platform_device *pdev)if (ret <0 )return ret; - regulator->rdev =regulator_register (®ulator->info->reg_desc, - &config); + regulator->rdev =devm_regulator_register (&pdev->dev, + ®ulator->info->reg_desc, + &config);if (IS_ERR (regulator->rdev)) {dev_err (&pdev->dev,"Failed to register regulator %s\n" , regulator->info->reg_desc.name); - ret =PTR_ERR (regulator->rdev); -return ret; +return PTR_ERR (regulator->rdev); }/* Only LDO 5 and 6 has got the over current interrupt */
@@ -588,7 +588,7 @@ static int da9055_regulator_probe(struct platform_device *pdev)dev_err (&pdev->dev,"Failed to request Regulator IRQ %d: %d\n" , irq, ret); - goto err_regulator; +return ret; } } }
@@ -596,24 +596,10 @@ static int da9055_regulator_probe(struct platform_device *pdev)platform_set_drvdata (pdev, regulator);return 0 ; - -err_regulator: -regulator_unregister (regulator->rdev); -return ret; -} - -static int da9055_regulator_remove (struct platform_device *pdev) -{ -struct da9055_regulator *regulator =platform_get_drvdata (pdev); - -regulator_unregister (regulator->rdev); - -return 0 ; }static struct platform_driver da9055_regulator_driver = { .probe = da9055_regulator_probe, - .remove = da9055_regulator_remove, .driver = { .name ="da9055-regulator" , .owner =THIS_MODULE ,
Signature · 1 line
1.8.1.2
PATCH 8/8 regulator: fan53555: Convert to devm_regulator_register
In reply to Axel LinSigned-off-by Axel Lin <[email protected]>
--- drivers/regulator/fan53555.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/regulator/fan53555.c +1 -10
@@ -218,7 +218,7 @@ static int fan53555_regulator_register(struct fan53555_device_info *di, rdesc->vsel_mask =VSEL_NSEL_MASK ; rdesc->owner =THIS_MODULE ; - di->rdev =regulator_register (&di->desc, config); + di->rdev =devm_regulator_register (di->dev, &di->desc, config);return PTR_RET (di->rdev); }
@@ -291,14 +291,6 @@ static int fan53555_regulator_probe(struct i2c_client *client, } -static int fan53555_regulator_remove (struct i2c_client *client) -{ -struct fan53555_device_info *di =i2c_get_clientdata (client); - -regulator_unregister (di->rdev); -return 0 ; -} -static const struct i2c_device_id fan53555_id[] = { {"fan53555" ,-1 }, { },
@@ -309,7 +301,6 @@ static struct i2c_driver fan53555_regulator_driver = { .name = "fan53555-regulator", }, .probe = fan53555_regulator_probe, - .remove = fan53555_regulator_remove, .id_table = fan53555_id, };
Signature · 1 line
1.8.1.2
Quoted 1 line · Axel Lin
Signed-off-by Axel Lin <[email protected]>
Applied all, thanks.