[alsa-devel] [PATCH 0/2] omap: sound: style and warning fixes
These patches apply to Tony Lindgren's linux-omap tree (they can also be applied to Linus' tree) They fix a warning at compile time and a coding style error.
This patch applies against Tony Lindgren's linux-omap tree It fixes "ambiguous else" warnings at compile time.
Signed-off-by: Michael Opdenacker michael.opdenacker@linaro.org --- sound/soc/omap/omap-mcbsp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 478d607..1391ea0 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -516,11 +516,12 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai, struct omap_mcbsp_reg_cfg *regs = &mcbsp_data->regs; int err = 0;
- if (mcbsp_data->active) + if (mcbsp_data->active) { if (freq == mcbsp_data->in_freq) return 0; else return -EBUSY; + }
/* The McBSP signal muxing functions are only available on McBSP1 */ if (clk_id == OMAP_MCBSP_CLKR_SRC_CLKR ||
Hi
On 10/10/2011 08:07 AM, Michael Opdenacker wrote:
This patch applies against Tony Lindgren's linux-omap tree It fixes "ambiguous else" warnings at compile time.
Signed-off-by: Michael Opdenackermichael.opdenacker@linaro.org
sound/soc/omap/omap-mcbsp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
This is already fixed in ASoC tree by following commit
commit 141947e6ceb8f82fe8382b26f093bb379af9af15 Author: Peter Ujfalusi peter.ujfalusi@ti.com Date: Mon Sep 26 10:56:42 2011 +0300
ASoC: omap-mcbsp: Fix compile time warning about ambiguous ‘else’
Signed-off-by: Michael Opdenacker michael.opdenacker@linaro.org --- sound/soc/omap/omap-mcbsp.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 1391ea0..30325fb 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -606,8 +606,7 @@ static int mcbsp_dai_probe(struct snd_soc_dai *dai) return 0; }
-static struct snd_soc_dai_driver omap_mcbsp_dai = -{ +static struct snd_soc_dai_driver omap_mcbsp_dai = { .probe = mcbsp_dai_probe, .playback = { .channels_min = 1,
On 10/10/2011 08:07 AM, Michael Opdenacker wrote:
Signed-off-by: Michael Opdenackermichael.opdenacker@linaro.org
sound/soc/omap/omap-mcbsp.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 1391ea0..30325fb 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -606,8 +606,7 @@ static int mcbsp_dai_probe(struct snd_soc_dai *dai) return 0; }
-static struct snd_soc_dai_driver omap_mcbsp_dai = -{ +static struct snd_soc_dai_driver omap_mcbsp_dai = {
Acked-by: Jarkko Nikula jarkko.nikula@bitmer.com
On Mon, Oct 10, 2011 at 07:07:08AM +0200, Michael Opdenacker wrote:
Signed-off-by: Michael Opdenacker michael.opdenacker@linaro.org
Applied, but please do try to make sure your changelogs resemble those for the rest of the subsystem. Especially for trivial patches it's not good to increase the effort required to apply them.
participants (3)
-
Jarkko Nikula -
Mark Brown -
Michael Opdenacker