ASoC: ak4535: Use devm_regmap_init_i2c()
devm_regmap_init_i2c() is device managed and makes error handling and code cleanup simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
9489e9dcae
commit
77d19b10a4
|
@ -447,7 +447,7 @@ static __devinit int ak4535_i2c_probe(struct i2c_client *i2c,
|
|||
if (ak4535 == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
ak4535->regmap = regmap_init_i2c(i2c, &ak4535_regmap);
|
||||
ak4535->regmap = devm_regmap_init_i2c(i2c, &ak4535_regmap);
|
||||
if (IS_ERR(ak4535->regmap)) {
|
||||
ret = PTR_ERR(ak4535->regmap);
|
||||
dev_err(&i2c->dev, "Failed to init regmap: %d\n", ret);
|
||||
|
@ -458,18 +458,13 @@ static __devinit int ak4535_i2c_probe(struct i2c_client *i2c,
|
|||
|
||||
ret = snd_soc_register_codec(&i2c->dev,
|
||||
&soc_codec_dev_ak4535, &ak4535_dai, 1);
|
||||
if (ret != 0)
|
||||
regmap_exit(ak4535->regmap);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static __devexit int ak4535_i2c_remove(struct i2c_client *client)
|
||||
{
|
||||
struct ak4535_priv *ak4535 = i2c_get_clientdata(client);
|
||||
|
||||
snd_soc_unregister_codec(&client->dev);
|
||||
regmap_exit(ak4535->regmap);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue