Skip to contentSkip to conversation

PPC32: Fix the floppy driver, on CONFIG_NOT_COHERENT_CACHE.

DISCUSSION Geert Uytterhoeven 4 participants 4 messages Jan 5, 2004 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Geert Uytterhoeven

author
#1 lore raw
Quoted 28 lines · Linux Kernel Mailing List

ChangeSet 1.1356.1.2, 2004/01/02 08:51:54-07:00, [email protected]

PPC32: Fix the floppy driver, on CONFIG_NOT_COHERENT_CACHE. From David Mueller <[email protected]>.

# This patch includes the following deltas:
# ChangeSet 1.1356.1.1 -> 1.1356.1.2
# include/asm-ppc/floppy.h 1.5 -> 1.6
#

 floppy.h |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

diff -Nru a/include/asm-ppc/floppy.h b/include/asm-ppc/floppy.h

include/asm-ppc/floppy.h +1 -1
@@ -12,7 +12,7 @@
 #define __ASM_PPC_FLOPPY_H
 
 #define fd_inb(port)			inb_p(port)
-#define fd_outb(port,value)		outb_p(port,value)
+#define fd_outb(value,port)		outb_p(value,port)
 
 #define fd_enable_dma()         enable_dma(FLOPPY_DMA)
 #define fd_disable_dma()        disable_dma(FLOPPY_DMA)

include/asm-ppc/floppy.h line 27

Quoted 4 lines
include/asm-ppc/floppy.h +1 -0
@@ -24,7 +24,11 @@
 #define fd_set_dma_count(count) set_dma_count(FLOPPY_DMA,count)
 #define fd_enable_irq()         enable_irq(FLOPPY_IRQ)
 #define fd_disable_irq()        disable_irq(FLOPPY_IRQ)
+#if CONFIG_NOT_COHERENT_CACHE

^^^
Shouldn't this be #ifdef?

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

#2 lore raw
Quoted 26 lines · Geert Uytterhoeven
Quoted 25 lines · Linux Kernel Mailing List

ChangeSet 1.1356.1.2, 2004/01/02 08:51:54-07:00, [email protected]

PPC32: Fix the floppy driver, on CONFIG_NOT_COHERENT_CACHE. From David Mueller <[email protected]>.

# This patch includes the following deltas:
# ChangeSet 1.1356.1.1 -> 1.1356.1.2
# include/asm-ppc/floppy.h 1.5 -> 1.6
#

 floppy.h |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

diff -Nru a/include/asm-ppc/floppy.h b/include/asm-ppc/floppy.h

include/asm-ppc/floppy.h +1 -1
@@ -12,7 +12,7 @@
 #define __ASM_PPC_FLOPPY_H
 
 #define fd_inb(port)			inb_p(port)
-#define fd_outb(port,value)		outb_p(port,value)
+#define fd_outb(value,port)		outb_p(value,port)
Quoted 9 lines

include/asm-ppc/floppy.h line 27

Quoted 7 lines
include/asm-ppc/floppy.h +1 -0
 #define fd_enable_dma()         enable_dma(FLOPPY_DMA)
 #define fd_disable_dma()        disable_dma(FLOPPY_DMA)

@@ -24,7 +24,11 @@
 #define fd_set_dma_count(count) set_dma_count(FLOPPY_DMA,count)
 #define fd_enable_irq()         enable_irq(FLOPPY_IRQ)
 #define fd_disable_irq()        disable_irq(FLOPPY_IRQ)
+#if CONFIG_NOT_COHERENT_CACHE

^^^
Shouldn't this be #ifdef?

Yes, but I don't believe that any gcc that you're supposed to use on 2.4 complains about that...

... not a good way to start a week. :)

Signature · 2 lines
Tom Rini
http://gate.crashing.org/~trini/
#3 lore raw
In reply to Geert Uytterhoeven
Quoted 4 lines · Geert Uytterhoeven
Quoted 1 line · Linux Kernel Mailing List

+#if CONFIG_NOT_COHERENT_CACHE

^^^
Shouldn't this be #ifdef?

Doesn't matter. Config variables are always either defined to 1 or not defined at all (which is equivalent to 0 in #if).

Andreas.

Signature · 4 lines
Andreas Schwab, SuSE Labs, [email protected]
SuSE Linux AG, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
#4 lore raw

#ifdef usage (was Re: PPC32: Fix the floppy driver, on CONFIG_NOT_COHERENT_CACHE.

Quoted 9 lines · Andreas Schwab
Quoted 4 lines · Geert Uytterhoeven
Quoted 1 line · Linux Kernel Mailing List

+#if CONFIG_NOT_COHERENT_CACHE

^^^
Shouldn't this be #ifdef?

Doesn't matter. Config variables are always either defined to 1 or not defined at all (which is equivalent to 0 in #if).

It makes life a lot simpler for those who compile with -Wundef, which is why I did a bunch of cleanup back around 2.5.6mumble or so. It also found a real bug where '#if A | B | C' and there was a typo in B. There's also a few places where code used '#if LINUX_VERSION_CODE > NNNN' without
doing a #include of version.h - fortunately for us, all the cases of *that* happened to do the right thing when using the implied zero.