[PATCH 0/2] omap: sound: style and warning fixes

[PATCH 0/2] omap: sound: style and warning fixes

[Michael Opdenacker]

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.

[PATCH 1/2] omap: sound: fix "ambiguous else" warning

[Michael Opdenacker]

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 ||
-- 
1.7.4.1

[PATCH 2/2] omap: sound: fix checkpatch.pl error

[Michael Opdenacker]

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,
-- 
1.7.4.1

Re: [PATCH 1/2] omap: sound: fix "ambiguous else" warning

[Jarkko Nikula]

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 Opdenacker<michael.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’


-- 
Jarkko

Re: [PATCH 2/2] omap: sound: fix checkpatch.pl error

[Jarkko Nikula]

On 10/10/2011 08:07 AM, Michael Opdenacker wrote:
> 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 = {

Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>

Re: [PATCH 1/2] omap: sound: fix "ambiguous else" warning

[Michael Opdenacker]

On 10/10/2011 08:54 AM, Jarkko Nikula wrote:
> 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 Opdenacker<michael.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’
Perfect, thanks. I'll keep an eye on the ASoC tree next time.

Michael.


-- 
Michael Opdenacker, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
+ 33 621 604 642

Re: [PATCH 2/2] omap: sound: fix checkpatch.pl error

[Mark Brown]

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.

Re: [PATCH 2/2] omap: sound: fix checkpatch.pl error

[Michael Opdenacker]

Hi Mark,

On 10/10/2011 11:32 AM, Mark Brown wrote:
> 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.
Thanks! I will use "ASoC" in my commit messages if I understand correctly.

I must confess I didn't pay enough attention to the list of recipients,
which I just got from scripts/get_maintainer.pl.

I will be more careful next time.

Thanks again,

Michael.

-- 
Michael Opdenacker - Community Manager
Linaro, http://linaro.org
Cell: +33 621 604 642
IRC: 'opm' in #linaro on irc.freenode.net