remove some unused IDE stuff
RFC PATCH 1/1 remove some unused IDE stuff
This patch removes some dead IDE-related #define's and "static inline" functions.
Please double-check it since I've only tested it with grep and didn't try compilation.
Signed-off-by Adrian Bunk <[email protected]>
---
arch/ppc/platforms/hdpu.c | 40 ----------------------------------- include/asm-m68knommu/ide.h | 41 ------------------------------------ include/asm-parisc/ide.h | 5 ---- 3 files changed, 86 deletions(-)
arch/ppc/platforms/hdpu.c renamed from arch/ppc/platforms/hdpu.c.old +0 -40
@@ -608,46 +608,6 @@ } } -#if defined(CONFIG_BLK_DEV_IDE ) || defined(CONFIG_BLK_DEV_IDE_MODULE ) -static int hdpu_ide_check_region (ide_ioreg_t from,unsigned int extent) -{ -return check_region (from, extent); -} - -static void -hdpu_ide_request_region (ide_ioreg_t from,unsigned int extent,const char *name) -{ -request_region (from, extent, name); -return ; -} - -static void hdpu_ide_release_region (ide_ioreg_t from,unsigned int extent) -{ -release_region (from, extent); -return ; -} - -static void __init -hdpu_ide_pci_init_hwif_ports (hw_regs_t * hw,ide_ioreg_t data_port, -ide_ioreg_t ctrl_port,int *irq) -{ -struct pci_dev *dev; - -pci_for_each_dev (dev) { -if (((dev->class >>8 ) ==PCI_CLASS_STORAGE_IDE ) || - ((dev->class >>8 ) ==PCI_CLASS_STORAGE_RAID )) { - hw->irq = dev->irq; - -if (irq !=NULL ) { - *irq = dev->irq; - } - } - } - -return ; -} -#endif -void hdpu_heartbeat (void ) {if (mv64x60_read (&bh, MV64x60_GPP_VALUE) & (1 <<5 ))
include/asm-m68knommu/ide.h renamed from include/asm-m68knommu/ide.h.old +0 -41
47 lines not on this page · raw message
include/asm-parisc/ide.h renamed from include/asm-parisc/ide.h.old +0 -5
@@ -20,11 +20,6 @@#define IDE_ARCH_OBSOLETE_INIT #define ide_default_io_ctl (base) ((base) + 0x206)/* obsolete */ -#define ide_request_irq (irq,hand,flg,dev,id) request_irq((irq),(hand),(flg),(dev),(id)) -#define ide_free_irq (irq,dev_id) free_irq((irq), (dev_id)) -#define ide_check_region (from,extent) check_region((from), (extent)) -#define ide_request_region (from,extent,name) request_region((from), (extent), (name)) -#define ide_release_region (from,extent) release_region((from), (extent))/* Generic I/O and MEMIO string operations. */ #define __ide_insw insw
Hi Adrian,
Quoted 7 lines · Adrian Bunk
This patch removes some dead IDE-related #define's and "static inline" functions.
Please double-check it since I've only tested it with grep and didn't try compilation.
Signed-off-by Adrian Bunk <[email protected]>
I think the include/asm-m68knommu/ide.h should just be removed altogether. None of the underlying code support for it has been carried into 2.6, so it is pretty much useless.
Regards
Greg
Quoted 122 lines
---
arch/ppc/platforms/hdpu.c | 40 ----------------------------------- include/asm-m68knommu/ide.h | 41 ------------------------------------ include/asm-parisc/ide.h | 5 ---- 3 files changed, 86 deletions(-)arch/ppc/platforms/hdpu.c renamed from arch/ppc/platforms/hdpu.c.old +0
-40@@ -608,46 +608,6 @@ } } -#if defined(CONFIG_BLK_DEV_IDE ) || defined(CONFIG_BLK_DEV_IDE_MODULE ) -static int hdpu_ide_check_region (ide_ioreg_t from,unsigned int extent) -{ -return check_region (from, extent); -} - -static void -hdpu_ide_request_region (ide_ioreg_t from,unsigned int extent,const char *name) -{ -request_region (from, extent, name); -return ; -} - -static void hdpu_ide_release_region (ide_ioreg_t from,unsigned int extent) -{ -release_region (from, extent); -return ; -} - -static void __init -hdpu_ide_pci_init_hwif_ports (hw_regs_t * hw,ide_ioreg_t data_port, -ide_ioreg_t ctrl_port,int *irq) -{ -struct pci_dev *dev; - -pci_for_each_dev (dev) { -if (((dev->class >>8 ) ==PCI_CLASS_STORAGE_IDE ) || - ((dev->class >>8 ) ==PCI_CLASS_STORAGE_RAID )) { - hw->irq = dev->irq; - -if (irq !=NULL ) { - *irq = dev->irq; - } - } - } - -return ; -} -#endif -void hdpu_heartbeat (void ) {if (mv64x60_read (&bh, MV64x60_GPP_VALUE) & (1 <<5 ))include/asm-m68knommu/ide.h renamed from include/asm-m68knommu/ide.h.old +0
-41@@ -141,47 +141,6 @@#define ide_init_default_irq (base) ide_default_irq(base) -static IDE_INLINE int -ide_request_irq ( -unsigned int irq, -void (*handler)(int ,void *,struct pt_regs *), -unsigned long flags, -const char *device, -void *dev_id) -{ -#ifdef CONFIG_COLDFIRE -mcf_autovector (irq); -#endif -return (request_irq (irq, handler, flags, device, dev_id)); -} - - -static IDE_INLINE void -ide_free_irq (unsigned int irq,void *dev_id) -{ -free_irq (irq, dev_id); -} - - -static IDE_INLINE int -ide_check_region (ide_ioreg_t from,unsigned int extent) -{ -return 0 ; -} - - -static IDE_INLINE void -ide_request_region (ide_ioreg_t from,unsigned int extent,const char *name) -{ -} - - -static IDE_INLINE void -ide_release_region (ide_ioreg_t from,unsigned int extent) -{ -} - - static IDE_INLINE voidide_fix_driveid (struct hd_driveid *id) {include/asm-parisc/ide.h renamed from include/asm-parisc/ide.h.old +0
-5@@ -20,11 +20,6 @@#define IDE_ARCH_OBSOLETE_INIT #define ide_default_io_ctl (base) ((base) + 0x206)/* obsolete */ -#define ide_request_irq (irq,hand,flg,dev,id) request_irq((irq),(hand),(flg),(dev),(id)) -#define ide_free_irq (irq,dev_id) free_irq((irq), (dev_id)) -#define ide_check_region (from,extent) check_region((from), (extent)) -#define ide_request_region (from,extent,name) request_region((from), (extent), (name)) -#define ide_release_region (from,extent) release_region((from), (extent))/* Generic I/O and MEMIO string operations. */ #define __ide_insw insw
Signature · 5 lines
------------------------------------------------------------------------ Greg Ungerer -- Chief Software Dude EMAIL: [email protected] SnapGear -- a CyberGuard Company PHONE: +61 7 3435 2888 825 Stanley St, FAX: +61 7 3891 3630 Woolloongabba, QLD, 4102, Australia WEB: http://www.SnapGear.com