Skip to contentSkip to conversation

ASoC: omap: Check regulator enable for DAC on Pandora

PATCH In review Mark Brown 3 participants 3 messages Mar 2, 2013 – Mar 3, 2013

Subsystems (2)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 ASoC: omap: Check regulator enable for DAC on Pandora

This will probably never fail but it's better style.

---
 sound/soc/omap/omap3pandora.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
sound/soc/omap/omap3pandora.c +5 -1
index 805512f..953483e 100644
@@ -85,7 +85,11 @@ static int omap3pandora_dac_event(struct snd_soc_dapm_widget *w,
 	 * VCC power on/off and /PD pin high/low
 	 */
 	if (SND_SOC_DAPM_EVENT_ON(event)) {
-		regulator_enable(omap3pandora_dac_reg);
+		ret = regulator_enable(omap3pandora_dac_reg);
+		if (ret != 0) {
+			dev_err(w->dapm.dev, "Failed to power DAC: %d\n", ret);
+			return ret;
+		}
 		mdelay(1);
 		gpio_set_value(OMAP3_PANDORA_DAC_POWER_GPIO, 1);
 	} else {
Signature · 1 line
1.7.10.4
Acked-by on v1 1/1
#1 lore raw
Quoted 12 lines · Mark Brown

This will probably never fail but it's better style.

---
 sound/soc/omap/omap3pandora.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
sound/soc/omap/omap3pandora.c +0 -0
index 805512f..953483e 100644

sound/soc/omap/omap3pandora.c static int omap3pandora_dac_event(struct snd_soc_dapm_widget *w, · line 89

Quoted 6 lines
sound/soc/omap/omap3pandora.c +2 -1
@@ -85,7 +85,11 @@ static int omap3pandora_dac_event(struct snd_soc_dapm_widget *w,
 	 * VCC power on/off and /PD pin high/low
 	 */
 	if (SND_SOC_DAPM_EVENT_ON(event)) {
-		regulator_enable(omap3pandora_dac_reg);
+		ret = regulator_enable(omap3pandora_dac_reg);
+		if (ret != 0) {

The rest of this machine driver uses "if (ret < 0)" or "if (ret)". I would use:
+ if (ret) {

sound/soc/omap/omap3pandora.c static int omap3pandora_dac_event(struct snd_soc_dapm_widget *w, · line 95

Quoted 7 lines
sound/soc/omap/omap3pandora.c +3 -0
+			dev_err(w->dapm.dev, "Failed to power DAC: %d\n", ret);
+			return ret;
+		}
 		mdelay(1);
 		gpio_set_value(OMAP3_PANDORA_DAC_POWER_GPIO, 1);
 	} else {

Otherwise:

Acked-by
#2 lore raw
Quoted 15 lines · Peter Ujfalusi

sound/soc/omap/omap3pandora.c static int omap3pandora_dac_event(struct snd_soc_dapm_widget *w, · line 89

Quoted 11 lines
sound/soc/omap/omap3pandora.c +2 -1
index 805512f..953483e 100644
@@ -85,7 +85,11 @@ static int omap3pandora_dac_event(struct snd_soc_dapm_widget *w,
 	 * VCC power on/off and /PD pin high/low
 	 */
 	if (SND_SOC_DAPM_EVENT_ON(event)) {
-		regulator_enable(omap3pandora_dac_reg);
+		ret = regulator_enable(omap3pandora_dac_reg);
+		if (ret != 0) {

The rest of this machine driver uses "if (ret < 0)" or "if (ret)". I would use:
+ if (ret) {

...

Quoted 3 lines

Otherwise:

To whatever version of (ret != 0), (ret) or (ret < 0) is used :-)