Re: PPC32: Fix the floppy driver, on CONFIG_NOT_COHERENT_CACHE.

Re: PPC32: Fix the floppy driver, on CONFIG_NOT_COHERENT_CACHE.

[Geert Uytterhoeven]

On Fri, 2 Jan 2004, Linux Kernel Mailing List wrote:
> ChangeSet 1.1356.1.2, 2004/01/02 08:51:54-07:00, trini@kernel.crashing.org
>
> 	PPC32: Fix the floppy driver, on CONFIG_NOT_COHERENT_CACHE.
> 	From David Mueller <d.mueller@elsoft.ch>.
>
>
> # 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
> --- a/include/asm-ppc/floppy.h	Sat Jan  3 12:02:06 2004
> +++ b/include/asm-ppc/floppy.h	Sat Jan  3 12:02:06 2004
> @@ -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)
> @@ -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 -- 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: PPC32: Fix the floppy driver, on CONFIG_NOT_COHERENT_CACHE.

[Tom Rini]

On Mon, Jan 05, 2004 at 03:04:47PM +0100, Geert Uytterhoeven wrote:
> On Fri, 2 Jan 2004, Linux Kernel Mailing List wrote:
> > ChangeSet 1.1356.1.2, 2004/01/02 08:51:54-07:00, trini@kernel.crashing.org
> >
> > 	PPC32: Fix the floppy driver, on CONFIG_NOT_COHERENT_CACHE.
> > 	From David Mueller <d.mueller@elsoft.ch>.
> >
> >
> > # 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
> > --- a/include/asm-ppc/floppy.h	Sat Jan  3 12:02:06 2004
> > +++ b/include/asm-ppc/floppy.h	Sat Jan  3 12:02:06 2004
> > @@ -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)
> > @@ -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. :)

-- 
Tom Rini
http://gate.crashing.org/~trini/

Re: PPC32: Fix the floppy driver, on CONFIG_NOT_COHERENT_CACHE.

[Andreas Schwab]

Geert Uytterhoeven <geert@linux-m68k.org> writes:

> On Fri, 2 Jan 2004, Linux Kernel Mailing List wrote:
>> +#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.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
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."

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

[Valdis.Kletnieks]

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

On Mon, 05 Jan 2004 17:07:23 +0100, Andreas Schwab said:
> Geert Uytterhoeven <geert@linux-m68k.org> writes:
> 
> > On Fri, 2 Jan 2004, Linux Kernel Mailing List wrote:
> >> +#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.  

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