Skip to content

Commit

Permalink
ASoC: wm8903: Convert to devm_regmap_init_i2c()
Browse files Browse the repository at this point in the history
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Mark Brown committed Jun 9, 2012
1 parent 0f16354 commit 7d11668
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions sound/soc/codecs/wm8903.c
Original file line number Diff line number Diff line change
Expand Up @@ -2124,7 +2124,7 @@ static __devinit int wm8903_i2c_probe(struct i2c_client *i2c,
return -ENOMEM;
wm8903->dev = &i2c->dev;

wm8903->regmap = regmap_init_i2c(i2c, &wm8903_regmap);
wm8903->regmap = devm_regmap_init_i2c(i2c, &wm8903_regmap);
if (IS_ERR(wm8903->regmap)) {
ret = PTR_ERR(wm8903->regmap);
dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
Expand Down Expand Up @@ -2191,7 +2191,6 @@ static __devinit int wm8903_i2c_probe(struct i2c_client *i2c,

return 0;
err:
regmap_exit(wm8903->regmap);
return ret;
}

Expand All @@ -2200,7 +2199,6 @@ static __devexit int wm8903_i2c_remove(struct i2c_client *client)
struct wm8903_priv *wm8903 = i2c_get_clientdata(client);

wm8903_free_gpio(wm8903);
regmap_exit(wm8903->regmap);
snd_soc_unregister_codec(&client->dev);

return 0;
Expand Down

0 comments on commit 7d11668

Please sign in to comment.