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-ia64 | |
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-ia64')
-rw-r--r-- | include/asm-ia64/ide.h | 29 |
1 files changed, 0 insertions, 29 deletions
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 | ||
19 | static 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 | |||
33 | static 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__ */ |