Commit 4fe96a22 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Linus Torvalds

[PATCH] ide: use generic ide_init_hwif_ports() on m68k

Also print the same warning as on m68k on other archs too.
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 979ac59d
...@@ -61,19 +61,6 @@ static __inline__ unsigned long ide_default_io_base(int index) ...@@ -61,19 +61,6 @@ static __inline__ unsigned long ide_default_io_base(int index)
return 0; return 0;
} }
/*
* 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,
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");
}
#define ide_init_default_irq(base) (0) #define ide_init_default_irq(base) (0)
/* /*
......
...@@ -308,11 +308,7 @@ static inline void ide_std_init_ports(hw_regs_t *hw, ...@@ -308,11 +308,7 @@ static inline void ide_std_init_ports(hw_regs_t *hw,
/* /*
* ide_init_hwif_ports() is OBSOLETE and will be removed in 2.7 series. * ide_init_hwif_ports() is OBSOLETE and will be removed in 2.7 series.
* New ports shouldn't define IDE_ARCH_OBSOLETE_INIT in <asm/ide.h>. * New ports shouldn't define IDE_ARCH_OBSOLETE_INIT in <asm/ide.h>.
*
* m68k, m68knommu (broken) and i386-pc9800 (broken)
* still have their own versions.
*/ */
#ifndef CONFIG_M68K
#ifdef IDE_ARCH_OBSOLETE_INIT #ifdef IDE_ARCH_OBSOLETE_INIT
static inline void ide_init_hwif_ports(hw_regs_t *hw, static inline void ide_init_hwif_ports(hw_regs_t *hw,
unsigned long io_addr, unsigned long io_addr,
...@@ -335,9 +331,15 @@ static inline void ide_init_hwif_ports(hw_regs_t *hw, ...@@ -335,9 +331,15 @@ static inline void ide_init_hwif_ports(hw_regs_t *hw,
#endif #endif
} }
#else #else
# define ide_init_hwif_ports(hw, io, ctl, irq) do {} while (0) static inline void ide_init_hwif_ports(hw_regs_t *hw,
unsigned long io_addr,
unsigned long ctl_addr,
int *irq)
{
if (io_addr || ctl_addr)
printk(KERN_WARNING "%s: must not be called\n", __FUNCTION__);
}
#endif /* IDE_ARCH_OBSOLETE_INIT */ #endif /* IDE_ARCH_OBSOLETE_INIT */
#endif /* !M68K */
/* Currently only m68k, apus and m8xx need it */ /* Currently only m68k, apus and m8xx need it */
#ifndef IDE_ARCH_ACK_INTR #ifndef IDE_ARCH_ACK_INTR
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment