regulator: lp8755: Use devm_regulator_register
PATCH 1/1 regulator: lp8755: Use devm_regulator_register
This patch moves data allocated using regulator_register to devm_regulator_register and does away with the calls to regulator_unregister. Also some labels are removed and a new labelerr is introduced which is less specific to context.
Signed-off-by Himangi Saraogi <[email protected]>
Acked-by Julia Lawall <[email protected]>
--- drivers/regulator/lp8755.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-)
drivers/regulator/lp8755.c +6 -17
@@ -339,22 +339,18 @@ static int lp8755_regulator_init(struct lp8755_chip *pchip) rconfig.init_data = pdata->buck_data[buck_num]; rconfig.of_node = pchip->dev->of_node; pchip->rdev[buck_num] = -regulator_register (&lp8755_regulators[buck_num], &rconfig); +devm_regulator_register (pchip->dev, + &lp8755_regulators[buck_num], &rconfig);if (IS_ERR (pchip->rdev[buck_num])) { ret =PTR_ERR (pchip->rdev[buck_num]); pchip->rdev[buck_num] =NULL ;dev_err (pchip->dev,"regulator init failed: buck %d\n" , buck_num); - goto err_buck; +return ret; } }return 0 ; - -err_buck: -for (icnt =0 ; icnt <LP8755_BUCK_MAX ; icnt++) -regulator_unregister (pchip->rdev[icnt]); -return ret; }static irqreturn_t lp8755_irq_handler (int irq,void *data)
@@ -490,23 +486,19 @@ static int lp8755_probe(struct i2c_client *client, ret =lp8755_regulator_init (pchip);if (ret <0 ) {dev_err (&client->dev,"fail to initialize regulators\n" ); - goto err_regulator; + goto err; } pchip->irq = client->irq; ret =lp8755_int_config (pchip);if (ret <0 ) {dev_err (&client->dev,"fail to irq config\n" ); - goto err_irq; + goto err; }return ret; -err_irq: -for (icnt =0 ; icnt < mphase_buck[pchip->mphase].nreg; icnt++) -regulator_unregister (pchip->rdev[icnt]); - -err_regulator: +err:/* output disable */ for (icnt =0 ; icnt <LP8755_BUCK_MAX ; icnt++)lp8755_write (pchip, icnt,0x00 );
@@ -519,9 +511,6 @@ static int lp8755_remove(struct i2c_client *client)int icnt;struct lp8755_chip *pchip =i2c_get_clientdata (client); -for (icnt =0 ; icnt < mphase_buck[pchip->mphase].nreg; icnt++) -regulator_unregister (pchip->rdev[icnt]); -for (icnt =0 ; icnt <LP8755_BUCK_MAX ; icnt++)lp8755_write (pchip, icnt,0x00 );
Signature · 1 line
1.9.1
Quoted 4 lines · Himangi Saraogi
This patch moves data allocated using
regulator_registertodevm_regulator_registerand does away with the calls toregulator_unregister. Also some labels are removed and a new labelerr is introduced which is less specific to context.
Applied, thanks.