redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

mfd: Convert tps65090 to devm_regmap_init_i2c()

Browse source 
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Axel Lin 2012-04-25 10:04:58 +08:00 committed by Samuel Ortiz
parent 1092e1c761
commit 1d88f7a01d
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/mfd/tps65090.c
View file

@ -294,8 +294,8 @@ static int __devinit tps65090_i2c_probe(struct i2c_client *client,
} }
} }
tps65090->rmap = regmap_init_i2c(tps65090->client, tps65090->rmap = devm_regmap_init_i2c(tps65090->client,
&tps65090_regmap_config); &tps65090_regmap_config);
if (IS_ERR(tps65090->rmap)) { if (IS_ERR(tps65090->rmap)) {
ret = PTR_ERR(tps65090->rmap); ret = PTR_ERR(tps65090->rmap);
dev_err(&client->dev, "regmap_init failed with err: %d\n", ret); dev_err(&client->dev, "regmap_init failed with err: %d\n", ret);
@ -307,14 +307,11 @@ static int __devinit tps65090_i2c_probe(struct i2c_client *client,
if (ret) { if (ret) {
dev_err(&client->dev, "add mfd devices failed with err: %d\n", dev_err(&client->dev, "add mfd devices failed with err: %d\n",
ret); ret);
goto err_regmap_exit; goto err_irq_exit;
} }
return 0; return 0;
err_regmap_exit:
regmap_exit(tps65090->rmap);
err_irq_exit: err_irq_exit:
if (client->irq) if (client->irq)
free_irq(client->irq, tps65090); free_irq(client->irq, tps65090);
@ -327,7 +324,6 @@ static int __devexit tps65090_i2c_remove(struct i2c_client *client)
struct tps65090 *tps65090 = i2c_get_clientdata(client); struct tps65090 *tps65090 = i2c_get_clientdata(client);
mfd_remove_devices(tps65090->dev); mfd_remove_devices(tps65090->dev);
regmap_exit(tps65090->rmap);
if (client->irq) if (client->irq)
free_irq(client->irq, tps65090); free_irq(client->irq, tps65090);