* [PATCH 1/2] ASoC: bf5xx-ac97: Fix compile error
@ 2013-07-30 11:34 Lars-Peter Clausen
2013-07-30 11:34 ` [PATCH 2/2] ASoC: bf5xx-ac97: Remove unused extern declaration Lars-Peter Clausen
2013-07-30 11:51 ` [PATCH 1/2] ASoC: bf5xx-ac97: Fix compile error Mark Brown
0 siblings, 2 replies; 6+ messages in thread
From: Lars-Peter Clausen @ 2013-07-30 11:34 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood; +Cc: alsa-devel, Lars-Peter Clausen
If CONFIG_SND_BF5XX_HAVE_COLD_RESET is enabled building the blackfin ac97 driver
fails with the following compile error:
sound/soc/blackfin/bf5xx-ac97.c: In function ‘asoc_bfin_ac97_probe’:
sound/soc/blackfin/bf5xx-ac97.c:297: error: expected ‘;’ before ‘{’ token
sound/soc/blackfin/bf5xx-ac97.c:302: error: label ‘gpio_err’ used but not defined
The issue was introduced in commit 6dab2fd7 ("ASoC: bf5xx-ac97: Convert to
devm_gpio_request_one()").
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/soc/blackfin/bf5xx-ac97.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c
index efb1dae..e82eb37 100644
--- a/sound/soc/blackfin/bf5xx-ac97.c
+++ b/sound/soc/blackfin/bf5xx-ac97.c
@@ -294,11 +294,12 @@ static int asoc_bfin_ac97_probe(struct platform_device *pdev)
/* Request PB3 as reset pin */
ret = devm_gpio_request_one(&pdev->dev,
CONFIG_SND_BF5XX_RESET_GPIO_NUM,
- GPIOF_OUT_INIT_HIGH, "SND_AD198x RESET") {
+ GPIOF_OUT_INIT_HIGH, "SND_AD198x RESET");
+ if (ret) {
dev_err(&pdev->dev,
"Failed to request GPIO_%d for reset: %d\n",
CONFIG_SND_BF5XX_RESET_GPIO_NUM, ret);
- goto gpio_err;
+ return ret;
}
#endif
--
1.8.0
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] ASoC: bf5xx-ac97: Remove unused extern declaration
2013-07-30 11:34 [PATCH 1/2] ASoC: bf5xx-ac97: Fix compile error Lars-Peter Clausen
@ 2013-07-30 11:34 ` Lars-Peter Clausen
2013-07-30 11:50 ` Mark Brown
2013-07-30 11:51 ` [PATCH 1/2] ASoC: bf5xx-ac97: Fix compile error Mark Brown
1 sibling, 1 reply; 6+ messages in thread
From: Lars-Peter Clausen @ 2013-07-30 11:34 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood; +Cc: alsa-devel, Lars-Peter Clausen
The blackfin ac97 driver never defines nor uses a global ac97 struct. So remove
the extern declaration for it.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/soc/blackfin/bf5xx-ac97.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/sound/soc/blackfin/bf5xx-ac97.h b/sound/soc/blackfin/bf5xx-ac97.h
index 0c3e22d..a680fdc 100644
--- a/sound/soc/blackfin/bf5xx-ac97.h
+++ b/sound/soc/blackfin/bf5xx-ac97.h
@@ -9,7 +9,6 @@
#ifndef _BF5XX_AC97_H
#define _BF5XX_AC97_H
-extern struct snd_ac97 *ac97;
/* Frame format in memory, only support stereo currently */
struct ac97_frame {
u16 ac97_tag; /* slot 0 */
--
1.8.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] ASoC: bf5xx-ac97: Remove unused extern declaration
2013-07-30 11:34 ` [PATCH 2/2] ASoC: bf5xx-ac97: Remove unused extern declaration Lars-Peter Clausen
@ 2013-07-30 11:50 ` Mark Brown
2013-07-30 11:54 ` Lars-Peter Clausen
0 siblings, 1 reply; 6+ messages in thread
From: Mark Brown @ 2013-07-30 11:50 UTC (permalink / raw)
To: Lars-Peter Clausen; +Cc: alsa-devel, Liam Girdwood
[-- Attachment #1.1: Type: text/plain, Size: 234 bytes --]
On Tue, Jul 30, 2013 at 01:34:10PM +0200, Lars-Peter Clausen wrote:
> The blackfin ac97 driver never defines nor uses a global ac97 struct. So remove
> the extern declaration for it.
This is a duplicate of my patch from yesterday...
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] ASoC: bf5xx-ac97: Remove unused extern declaration
2013-07-30 11:50 ` Mark Brown
@ 2013-07-30 11:54 ` Lars-Peter Clausen
2013-07-30 12:00 ` Mark Brown
0 siblings, 1 reply; 6+ messages in thread
From: Lars-Peter Clausen @ 2013-07-30 11:54 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, Liam Girdwood
On 07/30/2013 01:50 PM, Mark Brown wrote:
> On Tue, Jul 30, 2013 at 01:34:10PM +0200, Lars-Peter Clausen wrote:
>> The blackfin ac97 driver never defines nor uses a global ac97 struct. So remove
>> the extern declaration for it.
>
> This is a duplicate of my patch from yesterday...
>
No, this is a different one. Your patch removed the extern declaration for
bf5xx_ac97_ops this one removes it for ac97, which was on the next line.
- Lars
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] ASoC: bf5xx-ac97: Remove unused extern declaration
2013-07-30 11:54 ` Lars-Peter Clausen
@ 2013-07-30 12:00 ` Mark Brown
0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2013-07-30 12:00 UTC (permalink / raw)
To: Lars-Peter Clausen; +Cc: alsa-devel, Liam Girdwood
[-- Attachment #1.1: Type: text/plain, Size: 235 bytes --]
On Tue, Jul 30, 2013 at 01:54:00PM +0200, Lars-Peter Clausen wrote:
> No, this is a different one. Your patch removed the extern declaration for
> bf5xx_ac97_ops this one removes it for ac97, which was on the next line.
OK, applied.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] ASoC: bf5xx-ac97: Fix compile error
2013-07-30 11:34 [PATCH 1/2] ASoC: bf5xx-ac97: Fix compile error Lars-Peter Clausen
2013-07-30 11:34 ` [PATCH 2/2] ASoC: bf5xx-ac97: Remove unused extern declaration Lars-Peter Clausen
@ 2013-07-30 11:51 ` Mark Brown
1 sibling, 0 replies; 6+ messages in thread
From: Mark Brown @ 2013-07-30 11:51 UTC (permalink / raw)
To: Lars-Peter Clausen; +Cc: alsa-devel, Liam Girdwood
[-- Attachment #1.1: Type: text/plain, Size: 211 bytes --]
On Tue, Jul 30, 2013 at 01:34:09PM +0200, Lars-Peter Clausen wrote:
> If CONFIG_SND_BF5XX_HAVE_COLD_RESET is enabled building the blackfin ac97 driver
> fails with the following compile error:
Applied, thanks.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-07-30 12:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-30 11:34 [PATCH 1/2] ASoC: bf5xx-ac97: Fix compile error Lars-Peter Clausen
2013-07-30 11:34 ` [PATCH 2/2] ASoC: bf5xx-ac97: Remove unused extern declaration Lars-Peter Clausen
2013-07-30 11:50 ` Mark Brown
2013-07-30 11:54 ` Lars-Peter Clausen
2013-07-30 12:00 ` Mark Brown
2013-07-30 11:51 ` [PATCH 1/2] ASoC: bf5xx-ac97: Fix compile error Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.