[PATCH -next] blackfin: bf533-stamp: Remove bogus "||"

[PATCH -next] blackfin: bf533-stamp: Remove bogus "||"

[Geert Uytterhoeven]

arch/blackfin/mach-bf533/boards/stamp.c:545:2: error: operator '||' has no right operand
arch/blackfin/mach-bf533/boards/stamp.c:662:3: error: 'bfin_snd_resources' undeclared here (not in a function)
arch/blackfin/mach-bf533/boards/stamp.c:662:3: error: negative width in bit-field '<anonymous>'
arch/blackfin/mach-bf533/boards/stamp.c:665:21: error: 'bfin_snd_data' undeclared here (not in a function)
make[4]: *** [arch/blackfin/mach-bf533/boards/stamp.o] Error 1

Introduced by commit 15502e0ca0da651b48c7def2983e7bb464349b2a ("blackfin:
Remove references to the bf5x_tdm driver"), which removed two config
options, but only one "||".

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
http://kisskb.ellerman.id.au/kisskb/buildresult/8848472/

 arch/blackfin/mach-bf533/boards/stamp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c
index 1ea1dda..4a8c2e3 100644
--- a/arch/blackfin/mach-bf533/boards/stamp.c
+++ b/arch/blackfin/mach-bf533/boards/stamp.c
@@ -542,7 +542,7 @@ static struct platform_device bfin_dpmc = {
 };
 
 #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \
-	|| defined(CONFIG_SND_BF5XX_AC97) || \
+	defined(CONFIG_SND_BF5XX_AC97) || \
 	defined(CONFIG_SND_BF5XX_AC97_MODULE)
 
 #include <asm/bfin_sport.h>
-- 
1.7.0.4

Re: [PATCH -next] blackfin: bf533-stamp: Remove bogus "||"

[Lars-Peter Clausen]

On 05/31/2013 11:40 AM, Geert Uytterhoeven wrote:
> arch/blackfin/mach-bf533/boards/stamp.c:545:2: error: operator '||' has no right operand
> arch/blackfin/mach-bf533/boards/stamp.c:662:3: error: 'bfin_snd_resources' undeclared here (not in a function)
> arch/blackfin/mach-bf533/boards/stamp.c:662:3: error: negative width in bit-field '<anonymous>'
> arch/blackfin/mach-bf533/boards/stamp.c:665:21: error: 'bfin_snd_data' undeclared here (not in a function)
> make[4]: *** [arch/blackfin/mach-bf533/boards/stamp.o] Error 1
> 
> Introduced by commit 15502e0ca0da651b48c7def2983e7bb464349b2a ("blackfin:
> Remove references to the bf5x_tdm driver"), which removed two config
> options, but only one "||".
> 
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

Hm, right I missed that one, thanks.

Acked-by: Lars-Peter Clausen <lars@metafoo.de>

Mark can you queue it up in your topic/blackfin branch?

> ---
> http://kisskb.ellerman.id.au/kisskb/buildresult/8848472/
> 
>  arch/blackfin/mach-bf533/boards/stamp.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c
> index 1ea1dda..4a8c2e3 100644
> --- a/arch/blackfin/mach-bf533/boards/stamp.c
> +++ b/arch/blackfin/mach-bf533/boards/stamp.c
> @@ -542,7 +542,7 @@ static struct platform_device bfin_dpmc = {
>  };
>  
>  #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \
> -	|| defined(CONFIG_SND_BF5XX_AC97) || \
> +	defined(CONFIG_SND_BF5XX_AC97) || \
>  	defined(CONFIG_SND_BF5XX_AC97_MODULE)
>  
>  #include <asm/bfin_sport.h>

Re: [PATCH -next] blackfin: bf533-stamp: Remove bogus "||"

[Lars-Peter Clausen]

On 05/31/2013 11:40 AM, Geert Uytterhoeven wrote:
> arch/blackfin/mach-bf533/boards/stamp.c:545:2: error: operator '||' has no right operand
> arch/blackfin/mach-bf533/boards/stamp.c:662:3: error: 'bfin_snd_resources' undeclared here (not in a function)
> arch/blackfin/mach-bf533/boards/stamp.c:662:3: error: negative width in bit-field '<anonymous>'
> arch/blackfin/mach-bf533/boards/stamp.c:665:21: error: 'bfin_snd_data' undeclared here (not in a function)
> make[4]: *** [arch/blackfin/mach-bf533/boards/stamp.o] Error 1
> 
> Introduced by commit 15502e0ca0da651b48c7def2983e7bb464349b2a ("blackfin:
> Remove references to the bf5x_tdm driver"), which removed two config
> options, but only one "||".
> 
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

(resend with Mark's new E-Mail address)

Hm, right I missed that one, thanks.

Acked-by: Lars-Peter Clausen <lars@metafoo.de>

Mark can you queue it up in your topic/blackfin branch?

> ---
> http://kisskb.ellerman.id.au/kisskb/buildresult/8848472/
> 
>  arch/blackfin/mach-bf533/boards/stamp.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c
> index 1ea1dda..4a8c2e3 100644
> --- a/arch/blackfin/mach-bf533/boards/stamp.c
> +++ b/arch/blackfin/mach-bf533/boards/stamp.c
> @@ -542,7 +542,7 @@ static struct platform_device bfin_dpmc = {
>  };
>  
>  #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \
> -	|| defined(CONFIG_SND_BF5XX_AC97) || \
> +	defined(CONFIG_SND_BF5XX_AC97) || \
>  	defined(CONFIG_SND_BF5XX_AC97_MODULE)
>  
>  #include <asm/bfin_sport.h>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH -next] blackfin: bf533-stamp: Remove bogus "||"

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

On Fri, May 31, 2013 at 01:40:47PM +0200, Lars-Peter Clausen wrote:

> Mark can you queue it up in your topic/blackfin branch?

Only if someone were to send me the patch.  Geert, you should *ALWAYS*
CC maintainers.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH -next] blackfin: bf533-stamp: Remove bogus "||"

[Geert Uytterhoeven]

On Sat, Jun 1, 2013 at 9:03 PM, Mark Brown <broonie@kernel.org> wrote:
> On Fri, May 31, 2013 at 01:40:47PM +0200, Lars-Peter Clausen wrote:
>> Mark can you queue it up in your topic/blackfin branch?
>
> Only if someone were to send me the patch.  Geert, you should *ALWAYS*
> CC maintainers.

Sorry, I sent it to your Wolfson address, as suggested by get_maintainter.pl:

Mark Brown <broonie@opensource.wolfsonmicro.com> (commit_signer:3/4=75%)

You don't receive email there anymore? BTW, the Wolfson address is still listed
in 2 sections of MAINTAINERS.

I've forwarded the original email to your kernel.org address.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH -next] blackfin: bf533-stamp: Remove bogus "||"

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1033 bytes --]

On Sat, Jun 01, 2013 at 10:48:05PM +0200, Geert Uytterhoeven wrote:
> On Sat, Jun 1, 2013 at 9:03 PM, Mark Brown <broonie@kernel.org> wrote:

> > Only if someone were to send me the patch.  Geert, you should *ALWAYS*
> > CC maintainers.

> Sorry, I sent it to your Wolfson address, as suggested by get_maintainter.pl:

> Mark Brown <broonie@opensource.wolfsonmicro.com> (commit_signer:3/4=75%)

You're not using a current version of the tree you're submitting
against (which you should always do)...

> You don't receive email there anymore? BTW, the Wolfson address is still listed
> in 2 sections of MAINTAINERS.

No, I don't.  -next hasn't been rebuilt since the update to remove those
occurrences but note that they're for Wolfson drivers and the subsystems
have all been using my current address since mid-April and those updates
have propagated into Linus' tree already.

> I've forwarded the original email to your kernel.org address.

Please submit the patch normally so that it can be applied by tools
without hand editing.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH -next] blackfin: bf533-stamp: Remove bogus "||"

[Geert Uytterhoeven]

Hi Mark,

On Sat, Jun 1, 2013 at 11:10 PM, Mark Brown <broonie@kernel.org> wrote:
> On Sat, Jun 01, 2013 at 10:48:05PM +0200, Geert Uytterhoeven wrote:
>> On Sat, Jun 1, 2013 at 9:03 PM, Mark Brown <broonie@kernel.org> wrote:
>> > Only if someone were to send me the patch.  Geert, you should *ALWAYS*
>> > CC maintainers.
>
>> Sorry, I sent it to your Wolfson address, as suggested by get_maintainter.pl:
>
>> Mark Brown <broonie@opensource.wolfsonmicro.com> (commit_signer:3/4=75%)
>
> You're not using a current version of the tree you're submitting
> against (which you should always do)...

I'm using next-20130531.

>> I've forwarded the original email to your kernel.org address.
>
> Please submit the patch normally so that it can be applied by tools
> without hand editing.

Two acks added and resubmitted to the new address.
Thanks for applying!

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH -next] blackfin: bf533-stamp: Remove bogus "||"

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 684 bytes --]

On Sat, Jun 01, 2013 at 11:29:23PM +0200, Geert Uytterhoeven wrote:
> On Sat, Jun 1, 2013 at 11:10 PM, Mark Brown <broonie@kernel.org> wrote:

> >> Sorry, I sent it to your Wolfson address, as suggested by get_maintainter.pl:

> >> Mark Brown <broonie@opensource.wolfsonmicro.com> (commit_signer:3/4=75%)

> > You're not using a current version of the tree you're submitting
> > against (which you should always do)...

> I'm using next-20130531.

Which has broonie@kernel.org listed as the maintainer address...  the
commit signer information isn't awfully reliable at the best of times,
it's got a big tendency to throw up false positives for things like
people doing cleanup work.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH -next] blackfin: bf533-stamp: Remove bogus "||"

[Geert Uytterhoeven]

Hi Mark,

On Sun, Jun 2, 2013 at 12:06 AM, Mark Brown <broonie@kernel.org> wrote:
> On Sat, Jun 01, 2013 at 11:29:23PM +0200, Geert Uytterhoeven wrote:
>> On Sat, Jun 1, 2013 at 11:10 PM, Mark Brown <broonie@kernel.org> wrote:
>
>> >> Sorry, I sent it to your Wolfson address, as suggested by get_maintainter.pl:
>
>> >> Mark Brown <broonie@opensource.wolfsonmicro.com> (commit_signer:3/4=75%)
>
>> > You're not using a current version of the tree you're submitting
>> > against (which you should always do)...
>
>> I'm using next-20130531.
>
> Which has broonie@kernel.org listed as the maintainer address...  the

Sure, but not for arch/blackfin/.

> commit signer information isn't awfully reliable at the best of times,
> it's got a big tendency to throw up false positives for things like
> people doing cleanup work.

Yeah, that's unfortunate.

But in this case, the commit was commited with a SoB using your old
email address, only 5 days ago. So you may still have a stale
.gitconfig somewhere:

commit 15502e0ca0da651b48c7def2983e7bb464349b2a
Author: Lars-Peter Clausen <lars@metafoo.de>
Date:   Tue May 28 19:22:18 2013 +0200

    blackfin: Remove references to the bf5x_tdm driver

    The bf5x_tdm driver has been removed. Remove all references to it from board
    code.

    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH -next] blackfin: bf533-stamp: Remove bogus "||"

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 326 bytes --]

On Sun, Jun 02, 2013 at 10:04:42AM +0200, Geert Uytterhoeven wrote:

> But in this case, the commit was commited with a SoB using your old
> email address, only 5 days ago. So you may still have a stale
> .gitconfig somewhere:

No, this is correct.  I only finished working at Wolfson on Friday and
start at Linaro on Monday.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH -next] blackfin: bf533-stamp: Remove bogus "||"

[Mike Frysinger]

[-- Attachment #1: Type: Text/Plain, Size: 51 bytes --]

Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]