From 4fe96a221ca6b87f4140aff105a0ac145054aef9 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Wed, 2 Jun 2004 09:47:08 -0700 Subject: [PATCH] [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 Signed-off-by: Linus Torvalds --- include/asm-m68k/ide.h | 13 ------------- include/linux/ide.h | 14 ++++++++------ 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/include/asm-m68k/ide.h b/include/asm-m68k/ide.h index bcb701506e29f..c96054399e5c6 100644 --- 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 2cc8d79dd71b2..d74a18ca3d48a 100644 --- 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 . - * - * 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 -- 2.53.0