aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-24 16:53:31 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-24 16:53:31 -0400
commitf01d35d87f39ab794ddcdefadb79c11054bcbfbc (patch)
tree018c211b22e57819cc8456b4d85993bbdda92246 /include
parent35bbac9a2f73a7e0967d0a1d3e3673e2590ef716 (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')
-rw-r--r--include/asm-alpha/ide.h24
-rw-r--r--include/asm-ia64/ide.h29
-rw-r--r--include/asm-m32r/ide.h50
-rw-r--r--include/asm-mips/mach-generic/ide.h28
-rw-r--r--include/asm-x86/ide.h28
5 files changed, 0 insertions, 159 deletions
diff --git a/include/asm-alpha/ide.h b/include/asm-alpha/ide.h
index f44129abc02c..55f9f6870249 100644
--- a/include/asm-alpha/ide.h
+++ b/include/asm-alpha/ide.h
@@ -13,30 +13,6 @@
13 13
14#ifdef __KERNEL__ 14#ifdef __KERNEL__
15 15
16static inline int ide_default_irq(unsigned long base)
17{
18 switch (base) {
19 case 0x1f0: return 14;
20 case 0x170: return 15;
21 case 0x1e8: return 11;
22 case 0x168: return 10;
23 default:
24 return 0;
25 }
26}
27
28static inline unsigned long ide_default_io_base(int index)
29{
30 switch (index) {
31 case 0: return 0x1f0;
32 case 1: return 0x170;
33 case 2: return 0x1e8;
34 case 3: return 0x168;
35 default:
36 return 0;
37 }
38}
39
40#include <asm-generic/ide_iops.h> 16#include <asm-generic/ide_iops.h>
41 17
42#endif /* __KERNEL__ */ 18#endif /* __KERNEL__ */
diff --git a/include/asm-ia64/ide.h b/include/asm-ia64/ide.h
index 8fa3f8cd067a..5a0aedea4764 100644
--- a/include/asm-ia64/ide.h
+++ b/include/asm-ia64/ide.h
@@ -13,37 +13,8 @@
13 13
14#ifdef __KERNEL__ 14#ifdef __KERNEL__
15 15
16
17#include <linux/irq.h> 16#include <linux/irq.h>
18 17
19static inline int ide_default_irq(unsigned long base)
20{
21 switch (base) {
22 case 0x1f0: return isa_irq_to_vector(14);
23 case 0x170: return isa_irq_to_vector(15);
24 case 0x1e8: return isa_irq_to_vector(11);
25 case 0x168: return isa_irq_to_vector(10);
26 case 0x1e0: return isa_irq_to_vector(8);
27 case 0x160: return isa_irq_to_vector(12);
28 default:
29 return 0;
30 }
31}
32
33static inline unsigned long ide_default_io_base(int index)
34{
35 switch (index) {
36 case 0: return 0x1f0;
37 case 1: return 0x170;
38 case 2: return 0x1e8;
39 case 3: return 0x168;
40 case 4: return 0x1e0;
41 case 5: return 0x160;
42 default:
43 return 0;
44 }
45}
46
47#include <asm-generic/ide_iops.h> 18#include <asm-generic/ide_iops.h>
48 19
49#endif /* __KERNEL__ */ 20#endif /* __KERNEL__ */
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
18static __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
44static __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__ */
diff --git a/include/asm-mips/mach-generic/ide.h b/include/asm-mips/mach-generic/ide.h
index 8ee6bff030d9..73008f7bdc93 100644
--- a/include/asm-mips/mach-generic/ide.h
+++ b/include/asm-mips/mach-generic/ide.h
@@ -48,34 +48,6 @@ found:
48#endif 48#endif
49} 49}
50 50
51static __inline__ int ide_default_irq(unsigned long base)
52{
53 switch (base) {
54 case 0x1f0: return 14;
55 case 0x170: return 15;
56 case 0x1e8: return 11;
57 case 0x168: return 10;
58 case 0x1e0: return 8;
59 case 0x160: return 12;
60 default:
61 return 0;
62 }
63}
64
65static __inline__ unsigned long ide_default_io_base(int index)
66{
67 switch (index) {
68 case 0: return 0x1f0;
69 case 1: return 0x170;
70 case 2: return 0x1e8;
71 case 3: return 0x168;
72 case 4: return 0x1e0;
73 case 5: return 0x160;
74 default:
75 return 0;
76 }
77}
78
79/* MIPS port and memory-mapped I/O string operations. */ 51/* MIPS port and memory-mapped I/O string operations. */
80static inline void __ide_flush_prologue(void) 52static inline void __ide_flush_prologue(void)
81{ 53{
diff --git a/include/asm-x86/ide.h b/include/asm-x86/ide.h
index bc54879daed1..0289baf9ce0a 100644
--- a/include/asm-x86/ide.h
+++ b/include/asm-x86/ide.h
@@ -11,34 +11,6 @@
11 11
12#ifdef __KERNEL__ 12#ifdef __KERNEL__
13 13
14static __inline__ int ide_default_irq(unsigned long base)
15{
16 switch (base) {
17 case 0x1f0: return 14;
18 case 0x170: return 15;
19 case 0x1e8: return 11;
20 case 0x168: return 10;
21 case 0x1e0: return 8;
22 case 0x160: return 12;
23 default:
24 return 0;
25 }
26}
27
28static __inline__ unsigned long ide_default_io_base(int index)
29{
30 switch (index) {
31 case 0: return 0x1f0;
32 case 1: return 0x170;
33 case 2: return 0x1e8;
34 case 3: return 0x168;
35 case 4: return 0x1e0;
36 case 5: return 0x160;
37 default:
38 return 0;
39 }
40}
41
42#include <asm-generic/ide_iops.h> 14#include <asm-generic/ide_iops.h>
43 15
44#endif /* __KERNEL__ */ 16#endif /* __KERNEL__ */
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-01 21:18:30 -0500