Skip to content

Commit

Permalink
ASoC: wm8904: 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 8cb28fd commit d633edd
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions sound/soc/codecs/wm8904.c
Original file line number Diff line number Diff line change
Expand Up @@ -2263,7 +2263,7 @@ static __devinit int wm8904_i2c_probe(struct i2c_client *i2c,
if (wm8904 == NULL)
return -ENOMEM;

wm8904->regmap = regmap_init_i2c(i2c, &wm8904_regmap);
wm8904->regmap = devm_regmap_init_i2c(i2c, &wm8904_regmap);
if (IS_ERR(wm8904->regmap)) {
ret = PTR_ERR(wm8904->regmap);
dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
Expand All @@ -2283,15 +2283,12 @@ static __devinit int wm8904_i2c_probe(struct i2c_client *i2c,
return 0;

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

static __devexit int wm8904_i2c_remove(struct i2c_client *client)
{
struct wm8904_priv *wm8904 = i2c_get_clientdata(client);
snd_soc_unregister_codec(&client->dev);
regmap_exit(wm8904->regmap);
return 0;
}

Expand Down

0 comments on commit d633edd

Please sign in to comment.