summaryrefslogtreecommitdiffstats
path: root/include/asm-m32r/ide.h
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-24 22:53:31 +0200
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-24 22:53:31 +0200
commitf01d35d87f39ab794ddcdefadb79c11054bcbfbc (patch)
tree018c211b22e57819cc8456b4d85993bbdda92246 /include/asm-m32r/ide.h
parent35bbac9a2f73a7e0967d0a1d3e3673e2590ef716 (diff)
downloadop-kernel-dev-f01d35d87f39ab794ddcdefadb79c11054bcbfbc.zip
op-kernel-dev-f01d35d87f39ab794ddcdefadb79c11054bcbfbc.tar.gz
ide-generic: remove ide_default_{io_base,irq}() inlines (take 3)
Replace ide_default_{io_base,irq}() inlines by legacy_{bases,irqs}[]. v2: Add missing zero-ing of hws[] (caught during testing by Borislav Petkov). v3: Fix zero-oing of hws[] for _real_ this time. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include/asm-m32r/ide.h')
-rw-r--r--include/asm-m32r/ide.h50
1 files changed, 0 insertions, 50 deletions
diff --git a/include/asm-m32r/ide.h b/include/asm-m32r/ide.h
index d755d41..0f1ec69 100644
--- a/include/asm-m32r/ide.h
+++ b/include/asm-m32r/ide.h
@@ -13,56 +13,6 @@
#ifdef __KERNEL__
-#include <asm/m32r.h>
-
-static __inline__ int ide_default_irq(unsigned long base)
-{
- switch (base) {
-#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2) \
- || defined(CONFIG_PLAT_OPSPUT)
- case 0x1f0: return PLD_IRQ_CFIREQ;
- default:
- return 0;
-#elif defined(CONFIG_PLAT_MAPPI3)
- case 0x1f0: return PLD_IRQ_CFIREQ;
- case 0x170: return PLD_IRQ_IDEIREQ;
- default:
- return 0;
-#else
- case 0x1f0: return 14;
- case 0x170: return 15;
- case 0x1e8: return 11;
- case 0x168: return 10;
- case 0x1e0: return 8;
- case 0x160: return 12;
- default:
- return 0;
-#endif
- }
-}
-
-static __inline__ unsigned long ide_default_io_base(int index)
-{
- switch (index) {
-#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2) \
- || defined(CONFIG_PLAT_OPSPUT)
- case 0: return 0x1f0;
-#elif defined(CONFIG_PLAT_MAPPI3)
- case 0: return 0x1f0;
- case 1: return 0x170;
-#else
- case 0: return 0x1f0;
- case 1: return 0x170;
- case 2: return 0x1e8;
- case 3: return 0x168;
- case 4: return 0x1e0;
- case 5: return 0x160;
-#endif
- default:
- return 0;
- }
-}
-
#include <asm-generic/ide_iops.h>
#endif /* __KERNEL__ */
OpenPOWER on IntegriCloud