* [PATCH] ASoC: omap: Check regulator enable for DAC on Pandora
@ 2013-03-02 7:49 Mark Brown
2013-03-02 15:02 ` Peter Ujfalusi
0 siblings, 1 reply; 3+ messages in thread
From: Mark Brown @ 2013-03-02 7:49 UTC (permalink / raw)
To: Peter Ujfalusi, Jarkko Nikula
Cc: linux-omap, alsa-devel, Liam Girdwood, Mark Brown
This will probably never fail but it's better style.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
sound/soc/omap/omap3pandora.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
index 805512f..953483e 100644
--- a/sound/soc/omap/omap3pandora.c
+++ b/sound/soc/omap/omap3pandora.c
@@ -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 {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ASoC: omap: Check regulator enable for DAC on Pandora
2013-03-02 7:49 [PATCH] ASoC: omap: Check regulator enable for DAC on Pandora Mark Brown
@ 2013-03-02 15:02 ` Peter Ujfalusi
2013-03-03 9:11 ` Jarkko Nikula
0 siblings, 1 reply; 3+ messages in thread
From: Peter Ujfalusi @ 2013-03-02 15:02 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, linux-omap, Liam Girdwood, Jarkko Nikula
On 03/02/2013 08:49 AM, Mark Brown wrote:
> This will probably never fail but it's better style.
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
> sound/soc/omap/omap3pandora.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
> index 805512f..953483e 100644
> --- a/sound/soc/omap/omap3pandora.c
> +++ b/sound/soc/omap/omap3pandora.c
> @@ -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) {
> + 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: Peter Ujfalusi <peter.ujfalusi@ti.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ASoC: omap: Check regulator enable for DAC on Pandora
2013-03-02 15:02 ` Peter Ujfalusi
@ 2013-03-03 9:11 ` Jarkko Nikula
0 siblings, 0 replies; 3+ messages in thread
From: Jarkko Nikula @ 2013-03-03 9:11 UTC (permalink / raw)
To: Peter Ujfalusi; +Cc: linux-omap, Mark Brown, alsa-devel, Liam Girdwood
On Sat, 2013-03-02 at 16:02 +0100, Peter Ujfalusi wrote:
> > diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
> > index 805512f..953483e 100644
> > --- a/sound/soc/omap/omap3pandora.c
> > +++ b/sound/soc/omap/omap3pandora.c
> > @@ -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) {
>
...
> Otherwise:
> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
>
To whatever version of (ret != 0), (ret) or (ret < 0) is used :-)
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-03-03 9:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-02 7:49 [PATCH] ASoC: omap: Check regulator enable for DAC on Pandora Mark Brown
2013-03-02 15:02 ` Peter Ujfalusi
2013-03-03 9:11 ` Jarkko Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox