diff options
author | Yoshinori Sato <ysato@users.sourceforge.jp> | 2006-12-08 00:47:02 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2006-12-11 18:42:08 -0500 |
commit | 55eec11a50f4c5f53421f49e407e2c92cf25c3ca (patch) | |
tree | 8b1ddc4ed69b8da9897f8522dc6217617b226c0e | |
parent | 313887507f8ab9240d7b409c9e5ef2c75ac8e1fc (diff) |
sh: Kill off unused SE7619 I/O ops.
This can use the generic routines, so kill off the board-specific ones.
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | arch/sh/boards/se/7619/Makefile | 2 | ||||
-rw-r--r-- | arch/sh/boards/se/7619/io.c | 102 | ||||
-rw-r--r-- | arch/sh/boards/se/7619/setup.c | 21 |
3 files changed, 1 insertions, 124 deletions
diff --git a/arch/sh/boards/se/7619/Makefile b/arch/sh/boards/se/7619/Makefile index 3666eca8a658..d21775c28cda 100644 --- a/arch/sh/boards/se/7619/Makefile +++ b/arch/sh/boards/se/7619/Makefile | |||
@@ -2,4 +2,4 @@ | |||
2 | # Makefile for the 7619 SolutionEngine specific parts of the kernel | 2 | # Makefile for the 7619 SolutionEngine specific parts of the kernel |
3 | # | 3 | # |
4 | 4 | ||
5 | obj-y := setup.o io.o | 5 | obj-y := setup.o |
diff --git a/arch/sh/boards/se/7619/io.c b/arch/sh/boards/se/7619/io.c deleted file mode 100644 index 2f105c3dd818..000000000000 --- a/arch/sh/boards/se/7619/io.c +++ /dev/null | |||
@@ -1,102 +0,0 @@ | |||
1 | /* | ||
2 | * | ||
3 | * linux/arch/sh/boards/se/7619/io.c | ||
4 | * | ||
5 | * Copyright (C) 2006 Yoshinori Sato | ||
6 | * | ||
7 | * I/O routine for Hitachi 7619 SolutionEngine. | ||
8 | * | ||
9 | */ | ||
10 | |||
11 | #include <linux/kernel.h> | ||
12 | #include <linux/types.h> | ||
13 | #include <asm/io.h> | ||
14 | #include <asm/se7619.h> | ||
15 | #include <asm/irq.h> | ||
16 | |||
17 | /* FIXME: M3A-ZAB7 Compact Flash Slot support */ | ||
18 | |||
19 | static inline void delay(void) | ||
20 | { | ||
21 | ctrl_inw(0xa0000000); /* Uncached ROM area (P2) */ | ||
22 | } | ||
23 | |||
24 | #define badio(name,port) \ | ||
25 | printk("bad I/O operation (%s) for port 0x%lx at 0x%08x\n", \ | ||
26 | #name, (port), (__u32) __builtin_return_address(0)) | ||
27 | |||
28 | unsigned char se7619_inb(unsigned long port) | ||
29 | { | ||
30 | badio(inb, port); | ||
31 | return 0; | ||
32 | } | ||
33 | |||
34 | unsigned char se7619_inb_p(unsigned long port) | ||
35 | { | ||
36 | badio(inb_p, port); | ||
37 | delay(); | ||
38 | return 0; | ||
39 | } | ||
40 | |||
41 | unsigned short se7619_inw(unsigned long port) | ||
42 | { | ||
43 | badio(inw, port); | ||
44 | return 0; | ||
45 | } | ||
46 | |||
47 | unsigned int se7619_inl(unsigned long port) | ||
48 | { | ||
49 | badio(inl, port); | ||
50 | return 0; | ||
51 | } | ||
52 | |||
53 | void se7619_outb(unsigned char value, unsigned long port) | ||
54 | { | ||
55 | badio(outb, port); | ||
56 | } | ||
57 | |||
58 | void se7619_outb_p(unsigned char value, unsigned long port) | ||
59 | { | ||
60 | badio(outb_p, port); | ||
61 | delay(); | ||
62 | } | ||
63 | |||
64 | void se7619_outw(unsigned short value, unsigned long port) | ||
65 | { | ||
66 | badio(outw, port); | ||
67 | } | ||
68 | |||
69 | void se7619_outl(unsigned int value, unsigned long port) | ||
70 | { | ||
71 | badio(outl, port); | ||
72 | } | ||
73 | |||
74 | void se7619_insb(unsigned long port, void *addr, unsigned long count) | ||
75 | { | ||
76 | badio(inw, port); | ||
77 | } | ||
78 | |||
79 | void se7619_insw(unsigned long port, void *addr, unsigned long count) | ||
80 | { | ||
81 | badio(inw, port); | ||
82 | } | ||
83 | |||
84 | void se7619_insl(unsigned long port, void *addr, unsigned long count) | ||
85 | { | ||
86 | badio(insl, port); | ||
87 | } | ||
88 | |||
89 | void se7619_outsb(unsigned long port, const void *addr, unsigned long count) | ||
90 | { | ||
91 | badio(insl, port); | ||
92 | } | ||
93 | |||
94 | void se7619_outsw(unsigned long port, const void *addr, unsigned long count) | ||
95 | { | ||
96 | badio(insl, port); | ||
97 | } | ||
98 | |||
99 | void se7619_outsl(unsigned long port, const void *addr, unsigned long count) | ||
100 | { | ||
101 | badio(outsw, port); | ||
102 | } | ||
diff --git a/arch/sh/boards/se/7619/setup.c b/arch/sh/boards/se/7619/setup.c index d1b516ea6cf1..52d2c4d5d2fa 100644 --- a/arch/sh/boards/se/7619/setup.c +++ b/arch/sh/boards/se/7619/setup.c | |||
@@ -8,7 +8,6 @@ | |||
8 | 8 | ||
9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
10 | #include <linux/platform_device.h> | 10 | #include <linux/platform_device.h> |
11 | #include <asm/se7619.h> | ||
12 | #include <asm/io.h> | 11 | #include <asm/io.h> |
13 | #include <asm/machvec.h> | 12 | #include <asm/machvec.h> |
14 | 13 | ||
@@ -19,25 +18,5 @@ | |||
19 | struct sh_machine_vector mv_se __initmv = { | 18 | struct sh_machine_vector mv_se __initmv = { |
20 | .mv_name = "SolutionEngine", | 19 | .mv_name = "SolutionEngine", |
21 | .mv_nr_irqs = 108, | 20 | .mv_nr_irqs = 108, |
22 | .mv_inb = se7619_inb, | ||
23 | .mv_inw = se7619_inw, | ||
24 | .mv_inl = se7619_inl, | ||
25 | .mv_outb = se7619_outb, | ||
26 | .mv_outw = se7619_outw, | ||
27 | .mv_outl = se7619_outl, | ||
28 | |||
29 | .mv_inb_p = se7619_inb_p, | ||
30 | .mv_inw_p = se7619_inw, | ||
31 | .mv_inl_p = se7619_inl, | ||
32 | .mv_outb_p = se7619_outb_p, | ||
33 | .mv_outw_p = se7619_outw, | ||
34 | .mv_outl_p = se7619_outl, | ||
35 | |||
36 | .mv_insb = se7619_insb, | ||
37 | .mv_insw = se7619_insw, | ||
38 | .mv_insl = se7619_insl, | ||
39 | .mv_outsb = se7619_outsb, | ||
40 | .mv_outsw = se7619_outsw, | ||
41 | .mv_outsl = se7619_outsl, | ||
42 | }; | 21 | }; |
43 | ALIAS_MV(se) | 22 | ALIAS_MV(se) |