8xx drivers for 2.6

[Geert Uytterhoeven]

On Mon, 15 Dec 2003, Tom Rini wrote:
> On Mon, Dec 15, 2003 at 02:13:06PM +0200, Pantelis Antoniou wrote:
> > Tom Rini wrote:
> > >On Thu, Dec 11, 2003 at 02:44:50PM -0500, Dan Malek wrote:
> > >>Tom Rini wrote:
> > >>
> > >>>Ok. I've gone and ported the 8xx serial driver, and other misc 8xx
> > >>>things up to what 2.6 wants them to be, as well as a few of the
> > >>>simpler changes to head_8xx.S.
> > >>>
> > >>>
> > >>Thanks. So, does the kernel at least compile now? :-)
> > >>
> > >
> > >Compiles, links, boots and happily dies inside of head_8xx.S :)
> > >
> > >>>...and in 2.6 having request_8xxirq becomes much uglier because of
> > >>>the irqreturn_t stuff
> >
> > That sounds nice.
> >
> > Any chance to push the changes to the linuxppc-2.5 tree for us poor saps?
> > It doesn't have to work or anything, just give us something to work...
>
> Sure, done.

> diff -Nru a/include/linux/interrupt.h b/include/linux/interrupt.h
> --- a/include/linux/interrupt.h	Thu Dec 11 12:14:00 2003
> +++ b/include/linux/interrupt.h	Thu Dec 11 12:14:00 2003
> @@ -26,7 +26,9 @@
>   * IRQ_HANDLED means that we did have a valid interrupt and handled it.
>   * IRQ_RETVAL(x) selects on the two depending on x being non-zero (for handled)
>   */
> +#ifndef __CONFIG_8xx_DEFS
>  typedef int irqreturn_t;
> +#endif
>
>  #define IRQ_NONE	(0)
>  #define IRQ_HANDLED	(1)

And this breaks compilation for non-8xx machines in current linuxppc-2.5:

| In file included from arch/ppc/kernel/traps.c:29:
| include/linux/interrupt.h:38: error: parse error before "irqreturn_t"

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at 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

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/