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

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

ASoC: wm8955: 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 9489e9dc

sound/soc/codecs/wm8955.c

+1 −10
Original line number Original line Diff line number Diff line
@@ -1023,7 +1023,7 @@ static __devinit int wm8955_i2c_probe(struct i2c_client *i2c, 
	if (wm8955 == NULL)

	if (wm8955 == NULL)

		return -ENOMEM;

		return -ENOMEM;





	wm8955->regmap = regmap_init_i2c(i2c, &wm8955_regmap);

	wm8955->regmap = devm_regmap_init_i2c(i2c, &wm8955_regmap);

	if (IS_ERR(wm8955->regmap)) {

	if (IS_ERR(wm8955->regmap)) {

		ret = PTR_ERR(wm8955->regmap);

		ret = PTR_ERR(wm8955->regmap);

		dev_err(&i2c->dev, "Failed to allocate register map: %d\n",

		dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
@@ -1035,22 +1035,13 @@ static __devinit int wm8955_i2c_probe(struct i2c_client *i2c, 




	ret = snd_soc_register_codec(&i2c->dev,

	ret = snd_soc_register_codec(&i2c->dev,

			&soc_codec_dev_wm8955, &wm8955_dai, 1);

			&soc_codec_dev_wm8955, &wm8955_dai, 1);

	if (ret != 0)

		goto err;





	return ret;

	return ret;



err:

	regmap_exit(wm8955->regmap);

	return ret;

}

}





static __devexit int wm8955_i2c_remove(struct i2c_client *client)

static __devexit int wm8955_i2c_remove(struct i2c_client *client)

{

{

	struct wm8955_priv *wm8955 = i2c_get_clientdata(client);



	snd_soc_unregister_codec(&client->dev);

	snd_soc_unregister_codec(&client->dev);

	regmap_exit(wm8955->regmap);





	return 0;

	return 0;

}

}