mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
ASoC: cs42l52: Convert to devm_regmap_init_i2c()
Signed-off-by: Brian Austin <brian.austin@cirrus.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
571f6a7f07
commit
134b2f576b
1 changed files with 4 additions and 14 deletions
|
@ -1216,11 +1216,11 @@ static int cs42l52_i2c_probe(struct i2c_client *i2c_client,
|
|||
return -ENOMEM;
|
||||
cs42l52->dev = &i2c_client->dev;
|
||||
|
||||
cs42l52->regmap = regmap_init_i2c(i2c_client, &cs42l52_regmap);
|
||||
cs42l52->regmap = devm_regmap_init_i2c(i2c_client, &cs42l52_regmap);
|
||||
if (IS_ERR(cs42l52->regmap)) {
|
||||
ret = PTR_ERR(cs42l52->regmap);
|
||||
dev_err(&i2c_client->dev, "regmap_init() failed: %d\n", ret);
|
||||
goto err;
|
||||
return ret;
|
||||
}
|
||||
|
||||
i2c_set_clientdata(i2c_client, cs42l52);
|
||||
|
@ -1242,7 +1242,7 @@ static int cs42l52_i2c_probe(struct i2c_client *i2c_client,
|
|||
dev_err(&i2c_client->dev,
|
||||
"CS42L52 Device ID (%X). Expected %X\n",
|
||||
devid, CS42L52_CHIP_ID);
|
||||
goto err_regmap;
|
||||
return ret;
|
||||
}
|
||||
|
||||
regcache_cache_only(cs42l52->regmap, true);
|
||||
|
@ -1250,23 +1250,13 @@ static int cs42l52_i2c_probe(struct i2c_client *i2c_client,
|
|||
ret = snd_soc_register_codec(&i2c_client->dev,
|
||||
&soc_codec_dev_cs42l52, &cs42l52_dai, 1);
|
||||
if (ret < 0)
|
||||
goto err_regmap;
|
||||
return ret;
|
||||
return 0;
|
||||
|
||||
err_regmap:
|
||||
regmap_exit(cs42l52->regmap);
|
||||
|
||||
err:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int cs42l52_i2c_remove(struct i2c_client *client)
|
||||
{
|
||||
struct cs42l52_private *cs42l52 = i2c_get_clientdata(client);
|
||||
|
||||
snd_soc_unregister_codec(&client->dev);
|
||||
regmap_exit(cs42l52->regmap);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue