[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: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/include/asm-m68k/ide.h b/include/asm-m68k/ide.h
index bcb701506e29ff1ba940a9c38a2ca0cb0afdb942..c96054399e5c6d7fdaf7f8052ee9ff20af8030cd 100644 (file)
--- a/include/asm-m68k/ide.h
+++ b/include/asm-m68k/ide.h
@@ -61,19 +61,6 @@ static __inline__ unsigned long ide_default_io_base(int index)
           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)
 
 /*

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 2cc8d79dd71b209217b62a4e820a8e5fb7c74cd0..d74a18ca3d48aaacd3653394a4cc32202ef36127 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -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.
  * 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
 static inline void ide_init_hwif_ports(hw_regs_t *hw,
                                       unsigned long io_addr,
@@ -335,9 +331,15 @@ static inline void ide_init_hwif_ports(hw_regs_t *hw,
 #endif
 }
 #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 /* !M68K */
 
 /* Currently only m68k, apus and m8xx need it */
 #ifndef IDE_ARCH_ACK_INTR