Skip to contentSkip to conversation

blackfin: bf533-stamp: Remove bogus "||"

PATCH Superseded Geert Uytterhoeven 4 participants 11 messages May 31, 2013 – Jun 2, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 blackfin: bf533-stamp: Remove bogus "||"

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 "||".

---
http://kisskb.ellerman.id.au/kisskb/buildresult/8848472/

 arch/blackfin/mach-bf533/boards/stamp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/blackfin/mach-bf533/boards/stamp.c +1 -1
index 1ea1dda..4a8c2e3 100644
@@ -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>
Signature · 1 line
1.7.0.4
Acked-by on v1 1/1
#1 lore raw
Quoted 11 lines · 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 "||".

Hm, right I missed that one, thanks.

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

Quoted 19 lines

---
http://kisskb.ellerman.id.au/kisskb/buildresult/8848472/

 arch/blackfin/mach-bf533/boards/stamp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/blackfin/mach-bf533/boards/stamp.c +1 -1
index 1ea1dda..4a8c2e3 100644
@@ -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>
Acked-by on v1 1/1
#2 lore raw
In reply to Geert Uytterhoeven
Quoted 11 lines · 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 "||".

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

Hm, right I missed that one, thanks.

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

Quoted 11 lines

---
http://kisskb.ellerman.id.au/kisskb/buildresult/8848472/

 arch/blackfin/mach-bf533/boards/stamp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/blackfin/mach-bf533/boards/stamp.c +0 -0
index 1ea1dda..4a8c2e3 100644

arch/blackfin/mach-bf533/boards/stamp.c static struct platform_device bfin_dpmc = { · line 548

Quoted 8 lines
arch/blackfin/mach-bf533/boards/stamp.c +1 -1
@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

#3 lore raw
Quoted 1 line · Lars-Peter Clausen

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.

#4 lore raw
Quoted 5 lines · Mark Brown
Quoted 1 line · Lars-Peter Clausen

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 <[email protected]> (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 -- [email protected]

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

#5 lore raw
Quoted 8 lines · Geert Uytterhoeven
Quoted 2 lines · Mark Brown

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 <[email protected]> (commit_signer:3/4=75%)

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

Quoted 2 lines

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.

Quoted 1 line

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.

#6 lore raw

Hi Mark,

Quoted 11 lines · Mark Brown
Quoted 7 lines · Geert Uytterhoeven
Quoted 2 lines · Mark Brown

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 <[email protected]> (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.

Quoted 4 lines
Quoted 1 line

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 -- [email protected]

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

#7 lore raw
Quoted 10 lines · Geert Uytterhoeven
Quoted 6 lines · Mark Brown
Quoted 3 lines

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

Mark Brown <[email protected]> (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 [email protected] 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.

#8 lore raw

Hi Mark,

Quoted 5 lines · Mark Brown
Quoted 3 lines · Geert Uytterhoeven
Quoted 1 line · Mark Brown
Quoted 1 line

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

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Quoted 1 line

Mark Brown <[email protected]> (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 [email protected] listed as the maintainer address... the

Sure, but not for arch/blackfin/.

Quoted 3 lines

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 <[email protected]>
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.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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

#9 lore raw
Quoted 3 lines · Geert Uytterhoeven

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.