Merge remote-tracking branch 'asoc/topic/wm8993' into asoc-next

Mark Brown
2 parents 58f4f795b4 6dff9b3b05
Showing 1 changed file Side-by-side Diff
sound/soc/codecs/wm8993.c
@@ -1660,7 +1660,7 @@
 	wm8993->dev = &i2c->dev;
 	init_completion(&wm8993->fll_lock);
  
-	wm8993->regmap = regmap_init_i2c(i2c, &wm8993_regmap);
+	wm8993->regmap = devm_regmap_init_i2c(i2c, &wm8993_regmap);
 	if (IS_ERR(wm8993->regmap)) {
 		ret = PTR_ERR(wm8993->regmap);
 		dev_err(&i2c->dev, "Failed to allocate regmap: %d\n", ret);
  
  
@@ -1672,18 +1672,18 @@
 	for (i = 0; i < ARRAY_SIZE(wm8993->supplies); i++)
 		wm8993->supplies[i].supply = wm8993_supply_names[i];
  
-	ret = regulator_bulk_get(&i2c->dev, ARRAY_SIZE(wm8993->supplies),
+	ret = devm_regulator_bulk_get(&i2c->dev, ARRAY_SIZE(wm8993->supplies),
 				 wm8993->supplies);
 	if (ret != 0) {
 		dev_err(&i2c->dev, "Failed to request supplies: %d\n", ret);
-		goto err;
+		return ret;
 	}
  
 	ret = regulator_bulk_enable(ARRAY_SIZE(wm8993->supplies),
 				    wm8993->supplies);
 	if (ret != 0) {
 		dev_err(&i2c->dev, "Failed to enable supplies: %d\n", ret);
-		goto err_get;
+		return ret;
 	}
  
 	ret = regmap_read(wm8993->regmap, WM8993_SOFTWARE_RESET, &reg);
@@ -1742,10 +1742,6 @@
 		free_irq(i2c->irq, wm8993);
 err_enable:
 	regulator_bulk_disable(ARRAY_SIZE(wm8993->supplies), wm8993->supplies);
-err_get:
-	regulator_bulk_free(ARRAY_SIZE(wm8993->supplies), wm8993->supplies);
-err:
-	regmap_exit(wm8993->regmap);
 	return ret;
 }
  
  
@@ -1756,9 +1752,7 @@
 	snd_soc_unregister_codec(&i2c->dev);
 	if (i2c->irq)
 		free_irq(i2c->irq, wm8993);
-	regmap_exit(wm8993->regmap);
 	regulator_bulk_disable(ARRAY_SIZE(wm8993->supplies), wm8993->supplies);
-	regulator_bulk_free(ARRAY_SIZE(wm8993->supplies), wm8993->supplies);
  
 	return 0;
 }
...	...	@@ -1660,7 +1660,7 @@
1660	1660	wm8993->dev = &i2c->dev;
1661	1661	init_completion(&wm8993->fll_lock);
1662	1662
1663		- wm8993->regmap = regmap_init_i2c(i2c, &wm8993_regmap);
	1663	+ wm8993->regmap = devm_regmap_init_i2c(i2c, &wm8993_regmap);
1664	1664	if (IS_ERR(wm8993->regmap)) {
1665	1665	ret = PTR_ERR(wm8993->regmap);
1666	1666	dev_err(&i2c->dev, "Failed to allocate regmap: %d\n", ret);
1667	1667
1668	1668
...	...	@@ -1672,18 +1672,18 @@
1672	1672	for (i = 0; i < ARRAY_SIZE(wm8993->supplies); i++)
1673	1673	wm8993->supplies[i].supply = wm8993_supply_names[i];
1674	1674
1675		- ret = regulator_bulk_get(&i2c->dev, ARRAY_SIZE(wm8993->supplies),
	1675	+ ret = devm_regulator_bulk_get(&i2c->dev, ARRAY_SIZE(wm8993->supplies),
1676	1676	wm8993->supplies);
1677	1677	if (ret != 0) {
1678	1678	dev_err(&i2c->dev, "Failed to request supplies: %d\n", ret);
1679		- goto err;
	1679	+ return ret;
1680	1680	}
1681	1681
1682	1682	ret = regulator_bulk_enable(ARRAY_SIZE(wm8993->supplies),
1683	1683	wm8993->supplies);
1684	1684	if (ret != 0) {
1685	1685	dev_err(&i2c->dev, "Failed to enable supplies: %d\n", ret);
1686		- goto err_get;
	1686	+ return ret;
1687	1687	}
1688	1688
1689	1689	ret = regmap_read(wm8993->regmap, WM8993_SOFTWARE_RESET, &reg);
...	...	@@ -1742,10 +1742,6 @@
1742	1742	free_irq(i2c->irq, wm8993);
1743	1743	err_enable:
1744	1744	regulator_bulk_disable(ARRAY_SIZE(wm8993->supplies), wm8993->supplies);
1745		-err_get:
1746		- regulator_bulk_free(ARRAY_SIZE(wm8993->supplies), wm8993->supplies);
1747		-err:
1748		- regmap_exit(wm8993->regmap);
1749	1745	return ret;
1750	1746	}
1751	1747
1752	1748
...	...	@@ -1756,9 +1752,7 @@
1756	1752	snd_soc_unregister_codec(&i2c->dev);
1757	1753	if (i2c->irq)
1758	1754	free_irq(i2c->irq, wm8993);
1759		- regmap_exit(wm8993->regmap);
1760	1755	regulator_bulk_disable(ARRAY_SIZE(wm8993->supplies), wm8993->supplies);
1761		- regulator_bulk_free(ARRAY_SIZE(wm8993->supplies), wm8993->supplies);
1762	1756
1763	1757	return 0;
1764	1758	}