Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad2c175b authored by Sachin Kamat's avatar Sachin Kamat Committed by Mark Brown
Browse files

ASoC: wm8978: Use devm_regmap_init_i2c() 



devm_regmap_init_i2c() is device managed and makes error
handling and code cleanup simpler.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 978545e7

sound/soc/codecs/wm8978.c

+3 −10
Original line number Diff line number Diff line
@@ -1046,7 +1046,7 @@ static __devinit int wm8978_i2c_probe(struct i2c_client *i2c, 
	if (wm8978 == NULL)

		return -ENOMEM;



	wm8978->regmap = regmap_init_i2c(i2c, &wm8978_regmap_config);

	wm8978->regmap = devm_regmap_init_i2c(i2c, &wm8978_regmap_config);

	if (IS_ERR(wm8978->regmap)) {

		ret = PTR_ERR(wm8978->regmap);

		dev_err(&i2c->dev, "Failed to allocate regmap: %d\n", ret);
@@ -1059,29 +1059,22 @@ static __devinit int wm8978_i2c_probe(struct i2c_client *i2c, 
	ret = regmap_write(wm8978->regmap, WM8978_RESET, 0);

	if (ret != 0) {

		dev_err(&i2c->dev, "Failed to issue reset: %d\n", ret);

		goto err;

		return ret;

	}



	ret = snd_soc_register_codec(&i2c->dev,

			&soc_codec_dev_wm8978, &wm8978_dai, 1);

	if (ret != 0) {

		dev_err(&i2c->dev, "Failed to register CODEC: %d\n", ret);

		goto err;

		return ret;

	}



	return 0;



err:

	regmap_exit(wm8978->regmap);

	return ret;

}



static __devexit int wm8978_i2c_remove(struct i2c_client *client)

{

	struct wm8978_priv *wm8978 = i2c_get_clientdata(client);



	snd_soc_unregister_codec(&client->dev);

	regmap_exit(wm8978->regmap);



	return 0;

}