diff options
Diffstat (limited to 'arch/sh/boards/mach-titan/io.c')
| -rw-r--r-- | arch/sh/boards/mach-titan/io.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/arch/sh/boards/mach-titan/io.c b/arch/sh/boards/mach-titan/io.c index 4badad4c6f30..0130e9826aca 100644 --- a/arch/sh/boards/mach-titan/io.c +++ b/arch/sh/boards/mach-titan/io.c | |||
| @@ -17,8 +17,6 @@ u8 titan_inb(unsigned long port) | |||
| 17 | { | 17 | { |
| 18 | if (PXSEG(port)) | 18 | if (PXSEG(port)) |
| 19 | return ctrl_inb(port); | 19 | return ctrl_inb(port); |
| 20 | else if (is_pci_ioaddr(port)) | ||
| 21 | return ctrl_inb(pci_ioaddr(port)); | ||
| 22 | return ctrl_inw(port2adr(port)) & 0xff; | 20 | return ctrl_inw(port2adr(port)) & 0xff; |
| 23 | } | 21 | } |
| 24 | 22 | ||
| @@ -28,8 +26,6 @@ u8 titan_inb_p(unsigned long port) | |||
| 28 | 26 | ||
| 29 | if (PXSEG(port)) | 27 | if (PXSEG(port)) |
| 30 | v = ctrl_inb(port); | 28 | v = ctrl_inb(port); |
| 31 | else if (is_pci_ioaddr(port)) | ||
| 32 | v = ctrl_inb(pci_ioaddr(port)); | ||
| 33 | else | 29 | else |
| 34 | v = ctrl_inw(port2adr(port)) & 0xff; | 30 | v = ctrl_inw(port2adr(port)) & 0xff; |
| 35 | ctrl_delay(); | 31 | ctrl_delay(); |
| @@ -40,8 +36,6 @@ u16 titan_inw(unsigned long port) | |||
| 40 | { | 36 | { |
| 41 | if (PXSEG(port)) | 37 | if (PXSEG(port)) |
| 42 | return ctrl_inw(port); | 38 | return ctrl_inw(port); |
| 43 | else if (is_pci_ioaddr(port)) | ||
| 44 | return ctrl_inw(pci_ioaddr(port)); | ||
| 45 | else if (port >= 0x2000) | 39 | else if (port >= 0x2000) |
| 46 | return ctrl_inw(port2adr(port)); | 40 | return ctrl_inw(port2adr(port)); |
| 47 | else | 41 | else |
| @@ -53,8 +47,6 @@ u32 titan_inl(unsigned long port) | |||
| 53 | { | 47 | { |
| 54 | if (PXSEG(port)) | 48 | if (PXSEG(port)) |
| 55 | return ctrl_inl(port); | 49 | return ctrl_inl(port); |
| 56 | else if (is_pci_ioaddr(port)) | ||
| 57 | return ctrl_inl(pci_ioaddr(port)); | ||
| 58 | else if (port >= 0x2000) | 50 | else if (port >= 0x2000) |
| 59 | return ctrl_inw(port2adr(port)); | 51 | return ctrl_inw(port2adr(port)); |
| 60 | else | 52 | else |
| @@ -66,8 +58,6 @@ void titan_outb(u8 value, unsigned long port) | |||
| 66 | { | 58 | { |
| 67 | if (PXSEG(port)) | 59 | if (PXSEG(port)) |
| 68 | ctrl_outb(value, port); | 60 | ctrl_outb(value, port); |
| 69 | else if (is_pci_ioaddr(port)) | ||
| 70 | ctrl_outb(value, pci_ioaddr(port)); | ||
| 71 | else | 61 | else |
| 72 | ctrl_outw(value, port2adr(port)); | 62 | ctrl_outw(value, port2adr(port)); |
| 73 | } | 63 | } |
| @@ -76,8 +66,6 @@ void titan_outb_p(u8 value, unsigned long port) | |||
| 76 | { | 66 | { |
| 77 | if (PXSEG(port)) | 67 | if (PXSEG(port)) |
| 78 | ctrl_outb(value, port); | 68 | ctrl_outb(value, port); |
| 79 | else if (is_pci_ioaddr(port)) | ||
| 80 | ctrl_outb(value, pci_ioaddr(port)); | ||
| 81 | else | 69 | else |
| 82 | ctrl_outw(value, port2adr(port)); | 70 | ctrl_outw(value, port2adr(port)); |
| 83 | ctrl_delay(); | 71 | ctrl_delay(); |
| @@ -87,8 +75,6 @@ void titan_outw(u16 value, unsigned long port) | |||
| 87 | { | 75 | { |
| 88 | if (PXSEG(port)) | 76 | if (PXSEG(port)) |
| 89 | ctrl_outw(value, port); | 77 | ctrl_outw(value, port); |
| 90 | else if (is_pci_ioaddr(port)) | ||
| 91 | ctrl_outw(value, pci_ioaddr(port)); | ||
| 92 | else if (port >= 0x2000) | 78 | else if (port >= 0x2000) |
| 93 | ctrl_outw(value, port2adr(port)); | 79 | ctrl_outw(value, port2adr(port)); |
| 94 | else | 80 | else |
| @@ -99,8 +85,6 @@ void titan_outl(u32 value, unsigned long port) | |||
| 99 | { | 85 | { |
| 100 | if (PXSEG(port)) | 86 | if (PXSEG(port)) |
| 101 | ctrl_outl(value, port); | 87 | ctrl_outl(value, port); |
| 102 | else if (is_pci_ioaddr(port)) | ||
| 103 | ctrl_outl(value, pci_ioaddr(port)); | ||
| 104 | else | 88 | else |
| 105 | maybebadio(port); | 89 | maybebadio(port); |
| 106 | } | 90 | } |
| @@ -117,10 +101,8 @@ void titan_outsl(unsigned long port, const void *src, unsigned long count) | |||
| 117 | 101 | ||
| 118 | void __iomem *titan_ioport_map(unsigned long port, unsigned int size) | 102 | void __iomem *titan_ioport_map(unsigned long port, unsigned int size) |
| 119 | { | 103 | { |
| 120 | if (PXSEG(port) || is_pci_memaddr(port)) | 104 | if (PXSEG(port)) |
| 121 | return (void __iomem *)port; | 105 | return (void __iomem *)port; |
| 122 | else if (is_pci_ioaddr(port)) | ||
| 123 | return (void __iomem *)pci_ioaddr(port); | ||
| 124 | 106 | ||
| 125 | return (void __iomem *)port2adr(port); | 107 | return (void __iomem *)port2adr(port); |
| 126 | } | 108 | } |
