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

Commit 98ad089f authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: wm2200: Convert to devm APIs 



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

sound/soc/codecs/wm2200.c

+14 −25
Original line number Diff line number Diff line
@@ -2011,7 +2011,7 @@ static __devinit int wm2200_i2c_probe(struct i2c_client *i2c, 
	wm2200->dev = &i2c->dev;

	init_completion(&wm2200->fll_lock);



	wm2200->regmap = regmap_init_i2c(i2c, &wm2200_regmap);

	wm2200->regmap = devm_regmap_init_i2c(i2c, &wm2200_regmap);

	if (IS_ERR(wm2200->regmap)) {

		ret = PTR_ERR(wm2200->regmap);

		dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
@@ -2027,7 +2027,8 @@ static __devinit int wm2200_i2c_probe(struct i2c_client *i2c, 
	for (i = 0; i < ARRAY_SIZE(wm2200->core_supplies); i++)

		wm2200->core_supplies[i].supply = wm2200_core_supply_names[i];



	ret = regulator_bulk_get(&i2c->dev, ARRAY_SIZE(wm2200->core_supplies),

	ret = devm_regulator_bulk_get(&i2c->dev,

				      ARRAY_SIZE(wm2200->core_supplies),

				      wm2200->core_supplies);

	if (ret != 0) {

		dev_err(&i2c->dev, "Failed to request core supplies: %d\n",
@@ -2044,8 +2045,9 @@ static __devinit int wm2200_i2c_probe(struct i2c_client *i2c, 
	}



	if (wm2200->pdata.ldo_ena) {

		ret = gpio_request_one(wm2200->pdata.ldo_ena,

				       GPIOF_OUT_INIT_HIGH, "WM2200 LDOENA");

		ret = devm_gpio_request_one(&i2c->dev, wm2200->pdata.ldo_ena,

					    GPIOF_OUT_INIT_HIGH,

					    "WM2200 LDOENA");

		if (ret < 0) {

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

				wm2200->pdata.ldo_ena, ret);
@@ -2055,8 +2057,9 @@ static __devinit int wm2200_i2c_probe(struct i2c_client *i2c, 
	}



	if (wm2200->pdata.reset) {

		ret = gpio_request_one(wm2200->pdata.reset,

				       GPIOF_OUT_INIT_HIGH, "WM2200 /RESET");

		ret = devm_gpio_request_one(&i2c->dev, wm2200->pdata.reset,

					    GPIOF_OUT_INIT_HIGH,

					    "WM2200 /RESET");

		if (ret < 0) {

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

				wm2200->pdata.reset, ret);
@@ -2166,23 +2169,16 @@ static __devinit int wm2200_i2c_probe(struct i2c_client *i2c, 
err_pm_runtime:

	pm_runtime_disable(&i2c->dev);

err_reset:

	if (wm2200->pdata.reset) {

	if (wm2200->pdata.reset)

		gpio_set_value_cansleep(wm2200->pdata.reset, 0);

		gpio_free(wm2200->pdata.reset);

	}

err_ldo:

	if (wm2200->pdata.ldo_ena) {

	if (wm2200->pdata.ldo_ena)

		gpio_set_value_cansleep(wm2200->pdata.ldo_ena, 0);

		gpio_free(wm2200->pdata.ldo_ena);

	}

err_enable:

	regulator_bulk_disable(ARRAY_SIZE(wm2200->core_supplies),

			       wm2200->core_supplies);

err_core:

	regulator_bulk_free(ARRAY_SIZE(wm2200->core_supplies),

			    wm2200->core_supplies);

err_regmap:

	regmap_exit(wm2200->regmap);

err:

	return ret;

}
@@ -2194,17 +2190,10 @@ static __devexit int wm2200_i2c_remove(struct i2c_client *i2c) 
	snd_soc_unregister_codec(&i2c->dev);

	if (i2c->irq)

		free_irq(i2c->irq, wm2200);

	if (wm2200->pdata.reset) {

	if (wm2200->pdata.reset)

		gpio_set_value_cansleep(wm2200->pdata.reset, 0);

		gpio_free(wm2200->pdata.reset);

	}

	if (wm2200->pdata.ldo_ena) {

	if (wm2200->pdata.ldo_ena)

		gpio_set_value_cansleep(wm2200->pdata.ldo_ena, 0);

		gpio_free(wm2200->pdata.ldo_ena);

	}

	regulator_bulk_free(ARRAY_SIZE(wm2200->core_supplies),

			    wm2200->core_supplies);

	regmap_exit(wm2200->regmap);



	return 0;

}