aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-03-27 12:16:58 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-03-27 13:39:08 -0400
commit0b8d6e59a128f4fecce9ea3cddc1872a60a29402 (patch)
treec89e19daa2d5cdd7bb88ebe758c86936794055f9
parent05005c5f290cf0c4f1d4173d18fc90ea2223a043 (diff)
bcma: mark eromptr as __iomem
This fixes some sparse warnings. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/bcma/scan.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index 8d0b57164018..bca9c80056fe 100644
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
@@ -137,19 +137,19 @@ static void bcma_scan_switch_core(struct bcma_bus *bus, u32 addr)
137 addr); 137 addr);
138} 138}
139 139
140static u32 bcma_erom_get_ent(struct bcma_bus *bus, u32 **eromptr) 140static u32 bcma_erom_get_ent(struct bcma_bus *bus, u32 __iomem **eromptr)
141{ 141{
142 u32 ent = readl(*eromptr); 142 u32 ent = readl(*eromptr);
143 (*eromptr)++; 143 (*eromptr)++;
144 return ent; 144 return ent;
145} 145}
146 146
147static void bcma_erom_push_ent(u32 **eromptr) 147static void bcma_erom_push_ent(u32 __iomem **eromptr)
148{ 148{
149 (*eromptr)--; 149 (*eromptr)--;
150} 150}
151 151
152static s32 bcma_erom_get_ci(struct bcma_bus *bus, u32 **eromptr) 152static s32 bcma_erom_get_ci(struct bcma_bus *bus, u32 __iomem **eromptr)
153{ 153{
154 u32 ent = bcma_erom_get_ent(bus, eromptr); 154 u32 ent = bcma_erom_get_ent(bus, eromptr);
155 if (!(ent & SCAN_ER_VALID)) 155 if (!(ent & SCAN_ER_VALID))
@@ -159,14 +159,14 @@ static s32 bcma_erom_get_ci(struct bcma_bus *bus, u32 **eromptr)
159 return ent; 159 return ent;
160} 160}
161 161
162static bool bcma_erom_is_end(struct bcma_bus *bus, u32 **eromptr) 162static bool bcma_erom_is_end(struct bcma_bus *bus, u32 __iomem **eromptr)
163{ 163{
164 u32 ent = bcma_erom_get_ent(bus, eromptr); 164 u32 ent = bcma_erom_get_ent(bus, eromptr);
165 bcma_erom_push_ent(eromptr); 165 bcma_erom_push_ent(eromptr);
166 return (ent == (SCAN_ER_TAG_END | SCAN_ER_VALID)); 166 return (ent == (SCAN_ER_TAG_END | SCAN_ER_VALID));
167} 167}
168 168
169static bool bcma_erom_is_bridge(struct bcma_bus *bus, u32 **eromptr) 169static bool bcma_erom_is_bridge(struct bcma_bus *bus, u32 __iomem **eromptr)
170{ 170{
171 u32 ent = bcma_erom_get_ent(bus, eromptr); 171 u32 ent = bcma_erom_get_ent(bus, eromptr);
172 bcma_erom_push_ent(eromptr); 172 bcma_erom_push_ent(eromptr);
@@ -175,7 +175,7 @@ static bool bcma_erom_is_bridge(struct bcma_bus *bus, u32 **eromptr)
175 ((ent & SCAN_ADDR_TYPE) == SCAN_ADDR_TYPE_BRIDGE)); 175 ((ent & SCAN_ADDR_TYPE) == SCAN_ADDR_TYPE_BRIDGE));
176} 176}
177 177
178static void bcma_erom_skip_component(struct bcma_bus *bus, u32 **eromptr) 178static void bcma_erom_skip_component(struct bcma_bus *bus, u32 __iomem **eromptr)
179{ 179{
180 u32 ent; 180 u32 ent;
181 while (1) { 181 while (1) {
@@ -189,7 +189,7 @@ static void bcma_erom_skip_component(struct bcma_bus *bus, u32 **eromptr)
189 bcma_erom_push_ent(eromptr); 189 bcma_erom_push_ent(eromptr);
190} 190}
191 191
192static s32 bcma_erom_get_mst_port(struct bcma_bus *bus, u32 **eromptr) 192static s32 bcma_erom_get_mst_port(struct bcma_bus *bus, u32 __iomem **eromptr)
193{ 193{
194 u32 ent = bcma_erom_get_ent(bus, eromptr); 194 u32 ent = bcma_erom_get_ent(bus, eromptr);
195 if (!(ent & SCAN_ER_VALID)) 195 if (!(ent & SCAN_ER_VALID))
@@ -199,7 +199,7 @@ static s32 bcma_erom_get_mst_port(struct bcma_bus *bus, u32 **eromptr)
199 return ent; 199 return ent;
200} 200}
201 201
202static s32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 **eromptr, 202static s32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 __iomem **eromptr,
203 u32 type, u8 port) 203 u32 type, u8 port)
204{ 204{
205 u32 addrl, addrh, sizel, sizeh = 0; 205 u32 addrl, addrh, sizel, sizeh = 0;