diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-24 16:53:31 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-24 16:53:31 -0400 |
commit | f01d35d87f39ab794ddcdefadb79c11054bcbfbc (patch) | |
tree | 018c211b22e57819cc8456b4d85993bbdda92246 /include/asm-m32r/ide.h | |
parent | 35bbac9a2f73a7e0967d0a1d3e3673e2590ef716 (diff) |
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.h | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/include/asm-m32r/ide.h b/include/asm-m32r/ide.h index d755d41b9931..0f1ec6973879 100644 --- a/include/asm-m32r/ide.h +++ b/include/asm-m32r/ide.h | |||
@@ -13,56 +13,6 @@ | |||
13 | 13 | ||
14 | #ifdef __KERNEL__ | 14 | #ifdef __KERNEL__ |
15 | 15 | ||
16 | #include <asm/m32r.h> | ||
17 | |||
18 | static __inline__ int ide_default_irq(unsigned long base) | ||
19 | { | ||
20 | switch (base) { | ||
21 | #if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2) \ | ||
22 | || defined(CONFIG_PLAT_OPSPUT) | ||
23 | case 0x1f0: return PLD_IRQ_CFIREQ; | ||
24 | default: | ||
25 | return 0; | ||
26 | #elif defined(CONFIG_PLAT_MAPPI3) | ||
27 | case 0x1f0: return PLD_IRQ_CFIREQ; | ||
28 | case 0x170: return PLD_IRQ_IDEIREQ; | ||
29 | default: | ||
30 | return 0; | ||
31 | #else | ||
32 | case 0x1f0: return 14; | ||
33 | case 0x170: return 15; | ||
34 | case 0x1e8: return 11; | ||
35 | case 0x168: return 10; | ||
36 | case 0x1e0: return 8; | ||
37 | case 0x160: return 12; | ||
38 | default: | ||
39 | return 0; | ||
40 | #endif | ||
41 | } | ||
42 | } | ||
43 | |||
44 | static __inline__ unsigned long ide_default_io_base(int index) | ||
45 | { | ||
46 | switch (index) { | ||
47 | #if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2) \ | ||
48 | || defined(CONFIG_PLAT_OPSPUT) | ||
49 | case 0: return 0x1f0; | ||
50 | #elif defined(CONFIG_PLAT_MAPPI3) | ||
51 | case 0: return 0x1f0; | ||
52 | case 1: return 0x170; | ||
53 | #else | ||
54 | case 0: return 0x1f0; | ||
55 | case 1: return 0x170; | ||
56 | case 2: return 0x1e8; | ||
57 | case 3: return 0x168; | ||
58 | case 4: return 0x1e0; | ||
59 | case 5: return 0x160; | ||
60 | #endif | ||
61 | default: | ||
62 | return 0; | ||
63 | } | ||
64 | } | ||
65 | |||
66 | #include <asm-generic/ide_iops.h> | 16 | #include <asm-generic/ide_iops.h> |
67 | 17 | ||
68 | #endif /* __KERNEL__ */ | 18 | #endif /* __KERNEL__ */ |