Commit 77caabaa authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: wm5100: Convert to devm_regmap_init_i2c() 



Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent e06ab3b8

sound/soc/codecs/wm5100.c

+3 −6
Original line number Diff line number Diff line
@@ -2454,7 +2454,7 @@ static __devinit int wm5100_i2c_probe(struct i2c_client *i2c, 


	wm5100->dev = &i2c->dev;



	wm5100->regmap = regmap_init_i2c(i2c, &wm5100_regmap);

	wm5100->regmap = devm_regmap_init_i2c(i2c, &wm5100_regmap);

	if (IS_ERR(wm5100->regmap)) {

		ret = PTR_ERR(wm5100->regmap);

		dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
@@ -2479,7 +2479,7 @@ static __devinit int wm5100_i2c_probe(struct i2c_client *i2c, 
	if (ret != 0) {

		dev_err(&i2c->dev, "Failed to request core supplies: %d\n",

			ret);

		goto err_regmap;

		goto err;

	}



	ret = regulator_bulk_enable(ARRAY_SIZE(wm5100->core_supplies),
@@ -2487,7 +2487,7 @@ static __devinit int wm5100_i2c_probe(struct i2c_client *i2c, 
	if (ret != 0) {

		dev_err(&i2c->dev, "Failed to enable core supplies: %d\n",

			ret);

		goto err_regmap;

		goto err;

	}



	if (wm5100->pdata.ldo_ena) {
@@ -2660,8 +2660,6 @@ static __devinit int wm5100_i2c_probe(struct i2c_client *i2c, 
err_enable:

	regulator_bulk_disable(ARRAY_SIZE(wm5100->core_supplies),

			       wm5100->core_supplies);

err_regmap:

	regmap_exit(wm5100->regmap);

err:

	return ret;

}
@@ -2682,7 +2680,6 @@ static __devexit int wm5100_i2c_remove(struct i2c_client *i2c) 
		gpio_set_value_cansleep(wm5100->pdata.ldo_ena, 0);

		gpio_free(wm5100->pdata.ldo_ena);

	}

	regmap_exit(wm5100->regmap);



	return 0;

}