diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-04-20 06:39:57 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-20 06:39:57 -0400 |
commit | c563bf0965c86cc6087b09c34ca063fe96d6deca (patch) | |
tree | 59f19de457156a8ba9b68d227e2fa33d58985bd5 /arch/sh/boards/mach-systemh/io.c | |
parent | d556fcc101c4b0d57ac9742ab806a6bfed78eac1 (diff) |
sh: pci: Kill off dead references to is_pci_ioaddr and friends.
Some old boards are still using this in their I/O routines, kill it off.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boards/mach-systemh/io.c')
-rw-r--r-- | arch/sh/boards/mach-systemh/io.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/sh/boards/mach-systemh/io.c b/arch/sh/boards/mach-systemh/io.c index dec3db0ee933..15577ff1f715 100644 --- a/arch/sh/boards/mach-systemh/io.c +++ b/arch/sh/boards/mach-systemh/io.c | |||
@@ -35,8 +35,6 @@ unsigned char sh7751systemh_inb(unsigned long port) | |||
35 | { | 35 | { |
36 | if (PXSEG(port)) | 36 | if (PXSEG(port)) |
37 | return *(volatile unsigned char *)port; | 37 | return *(volatile unsigned char *)port; |
38 | else if (is_pci_ioaddr(port)) | ||
39 | return *(volatile unsigned char *)pci_ioaddr(port); | ||
40 | else if (port <= 0x3F1) | 38 | else if (port <= 0x3F1) |
41 | return *(volatile unsigned char *)ETHER_IOMAP(port); | 39 | return *(volatile unsigned char *)ETHER_IOMAP(port); |
42 | else | 40 | else |
@@ -49,8 +47,6 @@ unsigned char sh7751systemh_inb_p(unsigned long port) | |||
49 | 47 | ||
50 | if (PXSEG(port)) | 48 | if (PXSEG(port)) |
51 | v = *(volatile unsigned char *)port; | 49 | v = *(volatile unsigned char *)port; |
52 | else if (is_pci_ioaddr(port)) | ||
53 | v = *(volatile unsigned char *)pci_ioaddr(port); | ||
54 | else if (port <= 0x3F1) | 50 | else if (port <= 0x3F1) |
55 | v = *(volatile unsigned char *)ETHER_IOMAP(port); | 51 | v = *(volatile unsigned char *)ETHER_IOMAP(port); |
56 | else | 52 | else |
@@ -63,8 +59,6 @@ unsigned short sh7751systemh_inw(unsigned long port) | |||
63 | { | 59 | { |
64 | if (PXSEG(port)) | 60 | if (PXSEG(port)) |
65 | return *(volatile unsigned short *)port; | 61 | return *(volatile unsigned short *)port; |
66 | else if (is_pci_ioaddr(port)) | ||
67 | return *(volatile unsigned short *)pci_ioaddr(port); | ||
68 | else if (port >= 0x2000) | 62 | else if (port >= 0x2000) |
69 | return *port2adr(port); | 63 | return *port2adr(port); |
70 | else if (port <= 0x3F1) | 64 | else if (port <= 0x3F1) |
@@ -78,8 +72,6 @@ unsigned int sh7751systemh_inl(unsigned long port) | |||
78 | { | 72 | { |
79 | if (PXSEG(port)) | 73 | if (PXSEG(port)) |
80 | return *(volatile unsigned long *)port; | 74 | return *(volatile unsigned long *)port; |
81 | else if (is_pci_ioaddr(port)) | ||
82 | return *(volatile unsigned int *)pci_ioaddr(port); | ||
83 | else if (port >= 0x2000) | 75 | else if (port >= 0x2000) |
84 | return *port2adr(port); | 76 | return *port2adr(port); |
85 | else if (port <= 0x3F1) | 77 | else if (port <= 0x3F1) |
@@ -94,8 +86,6 @@ void sh7751systemh_outb(unsigned char value, unsigned long port) | |||
94 | 86 | ||
95 | if (PXSEG(port)) | 87 | if (PXSEG(port)) |
96 | *(volatile unsigned char *)port = value; | 88 | *(volatile unsigned char *)port = value; |
97 | else if (is_pci_ioaddr(port)) | ||
98 | *((unsigned char*)pci_ioaddr(port)) = value; | ||
99 | else if (port <= 0x3F1) | 89 | else if (port <= 0x3F1) |
100 | *(volatile unsigned char *)ETHER_IOMAP(port) = value; | 90 | *(volatile unsigned char *)ETHER_IOMAP(port) = value; |
101 | else | 91 | else |
@@ -106,8 +96,6 @@ void sh7751systemh_outb_p(unsigned char value, unsigned long port) | |||
106 | { | 96 | { |
107 | if (PXSEG(port)) | 97 | if (PXSEG(port)) |
108 | *(volatile unsigned char *)port = value; | 98 | *(volatile unsigned char *)port = value; |
109 | else if (is_pci_ioaddr(port)) | ||
110 | *((unsigned char*)pci_ioaddr(port)) = value; | ||
111 | else if (port <= 0x3F1) | 99 | else if (port <= 0x3F1) |
112 | *(volatile unsigned char *)ETHER_IOMAP(port) = value; | 100 | *(volatile unsigned char *)ETHER_IOMAP(port) = value; |
113 | else | 101 | else |
@@ -119,8 +107,6 @@ void sh7751systemh_outw(unsigned short value, unsigned long port) | |||
119 | { | 107 | { |
120 | if (PXSEG(port)) | 108 | if (PXSEG(port)) |
121 | *(volatile unsigned short *)port = value; | 109 | *(volatile unsigned short *)port = value; |
122 | else if (is_pci_ioaddr(port)) | ||
123 | *((unsigned short *)pci_ioaddr(port)) = value; | ||
124 | else if (port >= 0x2000) | 110 | else if (port >= 0x2000) |
125 | *port2adr(port) = value; | 111 | *port2adr(port) = value; |
126 | else if (port <= 0x3F1) | 112 | else if (port <= 0x3F1) |
@@ -133,8 +119,6 @@ void sh7751systemh_outl(unsigned int value, unsigned long port) | |||
133 | { | 119 | { |
134 | if (PXSEG(port)) | 120 | if (PXSEG(port)) |
135 | *(volatile unsigned long *)port = value; | 121 | *(volatile unsigned long *)port = value; |
136 | else if (is_pci_ioaddr(port)) | ||
137 | *((unsigned long*)pci_ioaddr(port)) = value; | ||
138 | else | 122 | else |
139 | maybebadio(port); | 123 | maybebadio(port); |
140 | } | 124 | } |