hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/drivers/bcma/scan.c
....@@ -219,7 +219,7 @@
219219 static u32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 __iomem **eromptr,
220220 u32 type, u8 port)
221221 {
222
- u32 addrl, addrh, sizel, sizeh = 0;
222
+ u32 addrl;
223223 u32 size;
224224
225225 u32 ent = bcma_erom_get_ent(bus, eromptr);
....@@ -233,18 +233,13 @@
233233
234234 addrl = ent & SCAN_ADDR_ADDR;
235235 if (ent & SCAN_ADDR_AG32)
236
- addrh = bcma_erom_get_ent(bus, eromptr);
237
- else
238
- addrh = 0;
236
+ bcma_erom_get_ent(bus, eromptr);
239237
240238 if ((ent & SCAN_ADDR_SZ) == SCAN_ADDR_SZ_SZD) {
241239 size = bcma_erom_get_ent(bus, eromptr);
242
- sizel = size & SCAN_SIZE_SZ;
243240 if (size & SCAN_SIZE_SG32)
244
- sizeh = bcma_erom_get_ent(bus, eromptr);
245
- } else
246
- sizel = SCAN_ADDR_SZ_BASE <<
247
- ((ent & SCAN_ADDR_SZ) >> SCAN_ADDR_SZ_SHIFT);
241
+ bcma_erom_get_ent(bus, eromptr);
242
+ }
248243
249244 return addrl;
250245 }
....@@ -425,11 +420,11 @@
425420 }
426421 }
427422 if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
428
- core->io_addr = ioremap_nocache(core->addr, BCMA_CORE_SIZE);
423
+ core->io_addr = ioremap(core->addr, BCMA_CORE_SIZE);
429424 if (!core->io_addr)
430425 return -ENOMEM;
431426 if (core->wrap) {
432
- core->io_wrap = ioremap_nocache(core->wrap,
427
+ core->io_wrap = ioremap(core->wrap,
433428 BCMA_CORE_SIZE);
434429 if (!core->io_wrap) {
435430 iounmap(core->io_addr);
....@@ -472,7 +467,7 @@
472467
473468 erombase = bcma_scan_read32(bus, 0, BCMA_CC_EROM);
474469 if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
475
- eromptr = ioremap_nocache(erombase, BCMA_CORE_SIZE);
470
+ eromptr = ioremap(erombase, BCMA_CORE_SIZE);
476471 if (!eromptr)
477472 return -ENOMEM;
478473 } else {