write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/drivers/bcma/scan.c
..
..
@@ -219,7 +219,7 @@
219
219
 static u32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 __iomem **eromptr,
220
220
 				  u32 type, u8 port)
221
221
 {
222
-	u32 addrl, addrh, sizel, sizeh = 0;
222
+	u32 addrl;
223
223
 	u32 size;
224
224
 
225
225
 	u32 ent = bcma_erom_get_ent(bus, eromptr);
..
..
@@ -233,18 +233,13 @@
233
233
 
234
234
 	addrl = ent & SCAN_ADDR_ADDR;
235
235
 	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);
239
237
 
240
238
 	if ((ent & SCAN_ADDR_SZ) == SCAN_ADDR_SZ_SZD) {
241
239
 		size = bcma_erom_get_ent(bus, eromptr);
242
-		sizel = size & SCAN_SIZE_SZ;
243
240
 		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
+	}
248
243
 
249
244
 	return addrl;
250
245
 }
..
..
@@ -425,11 +420,11 @@
425
420
 		}
426
421
 	}
427
422
 	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);
429
424
 		if (!core->io_addr)
430
425
 			return -ENOMEM;
431
426
 		if (core->wrap) {
432
-			core->io_wrap = ioremap_nocache(core->wrap,
427
+			core->io_wrap = ioremap(core->wrap,
433
428
 							BCMA_CORE_SIZE);
434
429
 			if (!core->io_wrap) {
435
430
 				iounmap(core->io_addr);
..
..
@@ -472,7 +467,7 @@
472
467
 
473
468
 	erombase = bcma_scan_read32(bus, 0, BCMA_CC_EROM);
474
469
 	if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
475
-		eromptr = ioremap_nocache(erombase, BCMA_CORE_SIZE);
470
+		eromptr = ioremap(erombase, BCMA_CORE_SIZE);
476
471
 		if (!eromptr)
477
472
 			return -ENOMEM;
478
473
 	} else {