Skip to content

Commit

Permalink
mfd: Convert tps65090 to devm_regmap_init_i2c()
Browse files Browse the repository at this point in the history
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
  • Loading branch information
Axel Lin authored and Samuel Ortiz committed May 9, 2012
1 parent 1092e1c commit 1d88f7a
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions drivers/mfd/tps65090.c
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,8 @@ static int __devinit tps65090_i2c_probe(struct i2c_client *client,
}
}

tps65090->rmap = regmap_init_i2c(tps65090->client,
&tps65090_regmap_config);
tps65090->rmap = devm_regmap_init_i2c(tps65090->client,
&tps65090_regmap_config);
if (IS_ERR(tps65090->rmap)) {
ret = PTR_ERR(tps65090->rmap);
dev_err(&client->dev, "regmap_init failed with err: %d\n", ret);
Expand All @@ -307,14 +307,11 @@ static int __devinit tps65090_i2c_probe(struct i2c_client *client,
if (ret) {
dev_err(&client->dev, "add mfd devices failed with err: %d\n",
ret);
goto err_regmap_exit;
goto err_irq_exit;
}

return 0;

err_regmap_exit:
regmap_exit(tps65090->rmap);

err_irq_exit:
if (client->irq)
free_irq(client->irq, tps65090);
Expand All @@ -327,7 +324,6 @@ static int __devexit tps65090_i2c_remove(struct i2c_client *client)
struct tps65090 *tps65090 = i2c_get_clientdata(client);

mfd_remove_devices(tps65090->dev);
regmap_exit(tps65090->rmap);
if (client->irq)
free_irq(client->irq, tps65090);

Expand Down

0 comments on commit 1d88f7a

Please sign in to comment.