mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
mfd: Convert tps65217 to devm_regmap_init_i2c()
Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
parent
1d88f7a01d
commit
0ef4619c74
1 changed files with 4 additions and 11 deletions
|
@ -150,7 +150,7 @@ static int __devinit tps65217_probe(struct i2c_client *client,
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
tps->pdata = pdata;
|
tps->pdata = pdata;
|
||||||
tps->regmap = regmap_init_i2c(client, &tps65217_regmap_config);
|
tps->regmap = devm_regmap_init_i2c(client, &tps65217_regmap_config);
|
||||||
if (IS_ERR(tps->regmap)) {
|
if (IS_ERR(tps->regmap)) {
|
||||||
ret = PTR_ERR(tps->regmap);
|
ret = PTR_ERR(tps->regmap);
|
||||||
dev_err(tps->dev, "Failed to allocate register map: %d\n",
|
dev_err(tps->dev, "Failed to allocate register map: %d\n",
|
||||||
|
@ -163,9 +163,9 @@ static int __devinit tps65217_probe(struct i2c_client *client,
|
||||||
|
|
||||||
ret = tps65217_reg_read(tps, TPS65217_REG_CHIPID, &version);
|
ret = tps65217_reg_read(tps, TPS65217_REG_CHIPID, &version);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(tps->dev, "Failed to read revision"
|
dev_err(tps->dev, "Failed to read revision register: %d\n",
|
||||||
" register: %d\n", ret);
|
ret);
|
||||||
goto err_regmap;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
dev_info(tps->dev, "TPS65217 ID %#x version 1.%d\n",
|
dev_info(tps->dev, "TPS65217 ID %#x version 1.%d\n",
|
||||||
|
@ -190,11 +190,6 @@ static int __devinit tps65217_probe(struct i2c_client *client,
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
err_regmap:
|
|
||||||
regmap_exit(tps->regmap);
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __devexit tps65217_remove(struct i2c_client *client)
|
static int __devexit tps65217_remove(struct i2c_client *client)
|
||||||
|
@ -205,8 +200,6 @@ static int __devexit tps65217_remove(struct i2c_client *client)
|
||||||
for (i = 0; i < TPS65217_NUM_REGULATOR; i++)
|
for (i = 0; i < TPS65217_NUM_REGULATOR; i++)
|
||||||
platform_device_unregister(tps->regulator_pdev[i]);
|
platform_device_unregister(tps->regulator_pdev[i]);
|
||||||
|
|
||||||
regmap_exit(tps->regmap);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue