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