[alsa-devel] [PATCH] ASoC: max98090: Convert to devm_regmap_init_i2c
Axel Lin
axel.lin at ingics.com
Sun Mar 3 09:49:06 CET 2013
Signed-off-by: Axel Lin <axel.lin at ingics.com>
---
sound/soc/codecs/max98090.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index fc17604..6dd36da 100755
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -2324,28 +2324,20 @@ static int max98090_i2c_probe(struct i2c_client *i2c,
max98090->pdata = i2c->dev.platform_data;
max98090->irq = i2c->irq;
- max98090->regmap = regmap_init_i2c(i2c, &max98090_regmap);
+ max98090->regmap = devm_regmap_init_i2c(i2c, &max98090_regmap);
if (IS_ERR(max98090->regmap)) {
ret = PTR_ERR(max98090->regmap);
dev_err(&i2c->dev, "Failed to allocate regmap: %d\n", ret);
- goto err_enable;
+ return ret;
}
- ret = snd_soc_register_codec(&i2c->dev,
- &soc_codec_dev_max98090, max98090_dai,
- ARRAY_SIZE(max98090_dai));
- if (ret < 0)
- regmap_exit(max98090->regmap);
-
-err_enable:
- return ret;
+ return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_max98090,
+ max98090_dai, ARRAY_SIZE(max98090_dai));
}
static int max98090_i2c_remove(struct i2c_client *client)
{
- struct max98090_priv *max98090 = dev_get_drvdata(&client->dev);
snd_soc_unregister_codec(&client->dev);
- regmap_exit(max98090->regmap);
return 0;
}
--
1.7.9.5
More information about the Alsa-devel
mailing list