[PATCH] M68k kill ide_ioreg_t

Geert Uytterhoeven (geert@linux-m68k.org)
Sun, 11 May 2003 12:31:01 +0200


M68k IDE: kill ide_ioreg_t and q40ide_ioreg_t

--- linux-2.5.x/include/asm-m68k/hdreg.h Thu May 13 20:00:09 1999
+++ linux-m68k-2.5.x/include/asm-m68k/hdreg.h Sun Mar 30 23:01:52 2003
@@ -7,7 +7,5 @@
#ifndef _M68K_HDREG_H
#define _M68K_HDREG_H

-typedef unsigned int q40ide_ioreg_t;
-typedef unsigned char * ide_ioreg_t;

#endif /* _M68K_HDREG_H */
--- linux-2.5.x/include/asm-m68k/ide.h Thu Mar 27 10:58:22 2003
+++ linux-m68k-2.5.x/include/asm-m68k/ide.h Wed Feb 26 14:03:24 2003
@@ -51,12 +51,12 @@
#endif


-static __inline__ int ide_default_irq(ide_ioreg_t base)
+static __inline__ int ide_default_irq(unsigned long base)
{
return 0;
}

-static __inline__ ide_ioreg_t ide_default_io_base(int index)
+static __inline__ unsigned long ide_default_io_base(int index)
{
return 0;
}
@@ -66,7 +66,9 @@
* Set up a hw structure for a specified data port, control port and IRQ.
* This should follow whatever the default interface uses.
*/
-static __inline__ void ide_init_hwif_ports(hw_regs_t *hw, ide_ioreg_t data_port, ide_ioreg_t ctrl_port, int *irq)
+static __inline__ void ide_init_hwif_ports(hw_regs_t *hw,
+ unsigned long data_port,
+ unsigned long ctrl_port, int *irq)
{
if (data_port || ctrl_port)
printk("ide_init_hwif_ports: must not be called\n");

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 - 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/