diff options
| -rw-r--r-- | arch/sh/boards/se/7619/io.c | 28 | ||||
| -rw-r--r-- | arch/sh/boards/se/7619/setup.c | 38 |
2 files changed, 33 insertions, 33 deletions
diff --git a/arch/sh/boards/se/7619/io.c b/arch/sh/boards/se/7619/io.c index 176f1f39cd9d..2f105c3dd818 100644 --- a/arch/sh/boards/se/7619/io.c +++ b/arch/sh/boards/se/7619/io.c | |||
| @@ -25,78 +25,78 @@ static inline void delay(void) | |||
| 25 | printk("bad I/O operation (%s) for port 0x%lx at 0x%08x\n", \ | 25 | printk("bad I/O operation (%s) for port 0x%lx at 0x%08x\n", \ |
| 26 | #name, (port), (__u32) __builtin_return_address(0)) | 26 | #name, (port), (__u32) __builtin_return_address(0)) |
| 27 | 27 | ||
| 28 | unsigned char se7619___inb(unsigned long port) | 28 | unsigned char se7619_inb(unsigned long port) |
| 29 | { | 29 | { |
| 30 | badio(inb, port); | 30 | badio(inb, port); |
| 31 | return 0; | 31 | return 0; |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | unsigned char se7619___inb_p(unsigned long port) | 34 | unsigned char se7619_inb_p(unsigned long port) |
| 35 | { | 35 | { |
| 36 | badio(inb_p, port); | 36 | badio(inb_p, port); |
| 37 | delay(); | 37 | delay(); |
| 38 | return 0; | 38 | return 0; |
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | unsigned short se7619___inw(unsigned long port) | 41 | unsigned short se7619_inw(unsigned long port) |
| 42 | { | 42 | { |
| 43 | badio(inw, port); | 43 | badio(inw, port); |
| 44 | return 0; | 44 | return 0; |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | unsigned int se7619___inl(unsigned long port) | 47 | unsigned int se7619_inl(unsigned long port) |
| 48 | { | 48 | { |
| 49 | badio(inl, port); | 49 | badio(inl, port); |
| 50 | return 0; | 50 | return 0; |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | void se7619___outb(unsigned char value, unsigned long port) | 53 | void se7619_outb(unsigned char value, unsigned long port) |
| 54 | { | 54 | { |
| 55 | badio(outb, port); | 55 | badio(outb, port); |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | void se7619___outb_p(unsigned char value, unsigned long port) | 58 | void se7619_outb_p(unsigned char value, unsigned long port) |
| 59 | { | 59 | { |
| 60 | badio(outb_p, port); | 60 | badio(outb_p, port); |
| 61 | delay(); | 61 | delay(); |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | void se7619___outw(unsigned short value, unsigned long port) | 64 | void se7619_outw(unsigned short value, unsigned long port) |
| 65 | { | 65 | { |
| 66 | badio(outw, port); | 66 | badio(outw, port); |
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | void se7619___outl(unsigned int value, unsigned long port) | 69 | void se7619_outl(unsigned int value, unsigned long port) |
| 70 | { | 70 | { |
| 71 | badio(outl, port); | 71 | badio(outl, port); |
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | void se7619___insb(unsigned long port, void *addr, unsigned long count) | 74 | void se7619_insb(unsigned long port, void *addr, unsigned long count) |
| 75 | { | 75 | { |
| 76 | badio(inw, port); | 76 | badio(inw, port); |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | void se7619___insw(unsigned long port, void *addr, unsigned long count) | 79 | void se7619_insw(unsigned long port, void *addr, unsigned long count) |
| 80 | { | 80 | { |
| 81 | badio(inw, port); | 81 | badio(inw, port); |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | void se7619___insl(unsigned long port, void *addr, unsigned long count) | 84 | void se7619_insl(unsigned long port, void *addr, unsigned long count) |
| 85 | { | 85 | { |
| 86 | badio(insl, port); | 86 | badio(insl, port); |
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | void se7619___outsb(unsigned long port, const void *addr, unsigned long count) | 89 | void se7619_outsb(unsigned long port, const void *addr, unsigned long count) |
| 90 | { | 90 | { |
| 91 | badio(insl, port); | 91 | badio(insl, port); |
| 92 | } | 92 | } |
| 93 | 93 | ||
| 94 | void se7619___outsw(unsigned long port, const void *addr, unsigned long count) | 94 | void se7619_outsw(unsigned long port, const void *addr, unsigned long count) |
| 95 | { | 95 | { |
| 96 | badio(insl, port); | 96 | badio(insl, port); |
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | void se7619___outsl(unsigned long port, const void *addr, unsigned long count) | 99 | void se7619_outsl(unsigned long port, const void *addr, unsigned long count) |
| 100 | { | 100 | { |
| 101 | badio(outsw, port); | 101 | badio(outsw, port); |
| 102 | } | 102 | } |
diff --git a/arch/sh/boards/se/7619/setup.c b/arch/sh/boards/se/7619/setup.c index e627b26de0d0..d1b516ea6cf1 100644 --- a/arch/sh/boards/se/7619/setup.c +++ b/arch/sh/boards/se/7619/setup.c | |||
| @@ -8,8 +8,8 @@ | |||
| 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/io.h> | ||
| 12 | #include <asm/se7619.h> | 11 | #include <asm/se7619.h> |
| 12 | #include <asm/io.h> | ||
| 13 | #include <asm/machvec.h> | 13 | #include <asm/machvec.h> |
| 14 | 14 | ||
| 15 | /* | 15 | /* |
| @@ -19,25 +19,25 @@ | |||
| 19 | struct sh_machine_vector mv_se __initmv = { | 19 | struct sh_machine_vector mv_se __initmv = { |
| 20 | .mv_name = "SolutionEngine", | 20 | .mv_name = "SolutionEngine", |
| 21 | .mv_nr_irqs = 108, | 21 | .mv_nr_irqs = 108, |
| 22 | .mv_inb = se7619___inb, | 22 | .mv_inb = se7619_inb, |
| 23 | .mv_inw = se7619___inw, | 23 | .mv_inw = se7619_inw, |
| 24 | .mv_inl = se7619___inl, | 24 | .mv_inl = se7619_inl, |
| 25 | .mv_outb = se7619___outb, | 25 | .mv_outb = se7619_outb, |
| 26 | .mv_outw = se7619___outw, | 26 | .mv_outw = se7619_outw, |
| 27 | .mv_outl = se7619___outl, | 27 | .mv_outl = se7619_outl, |
| 28 | 28 | ||
| 29 | .mv_inb_p = se7619___inb_p, | 29 | .mv_inb_p = se7619_inb_p, |
| 30 | .mv_inw_p = se7619___inw, | 30 | .mv_inw_p = se7619_inw, |
| 31 | .mv_inl_p = se7619___inl, | 31 | .mv_inl_p = se7619_inl, |
| 32 | .mv_outb_p = se7619___outb_p, | 32 | .mv_outb_p = se7619_outb_p, |
| 33 | .mv_outw_p = se7619___outw, | 33 | .mv_outw_p = se7619_outw, |
| 34 | .mv_outl_p = se7619___outl, | 34 | .mv_outl_p = se7619_outl, |
| 35 | 35 | ||
| 36 | .mv_insb = se7619___insb, | 36 | .mv_insb = se7619_insb, |
| 37 | .mv_insw = se7619___insw, | 37 | .mv_insw = se7619_insw, |
| 38 | .mv_insl = se7619___insl, | 38 | .mv_insl = se7619_insl, |
| 39 | .mv_outsb = se7619___outsb, | 39 | .mv_outsb = se7619_outsb, |
| 40 | .mv_outsw = se7619___outsw, | 40 | .mv_outsw = se7619_outsw, |
| 41 | .mv_outsl = se7619___outsl, | 41 | .mv_outsl = se7619_outsl, |
| 42 | }; | 42 | }; |
| 43 | ALIAS_MV(se) | 43 | ALIAS_MV(se) |
