Skip to contentSkip to conversation

firmware: bcm47xx_nvram: fix typo / build error

PATCH New Arnd Bergmann 1 participant 1 message Oct 12, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 firmware: bcm47xx_nvram: fix typo / build error

The change to the new __ioread32_copy() helper used the DIV_ROUND_UP macro incorrectly:

drivers/firmware/broadcom/bcm47xx_nvram.c: In function 'nvram_find_and_copy':
drivers/firmware/broadcom/bcm47xx_nvram.c:110:30: error: macro "DIV_ROUND_UP" requires 2 arguments, but only 1 given

The same commit also changed the behavior of the code in big-endian builds to no longer perform byte swaps, which looks intentional but was not part of the patch description.

Fixes 31e2fab1c36b ("FIRMWARE: bcm47xx_nvram: Use __ioread32_copy() instead of open-coding")
drivers/firmware/broadcom/bcm47xx_nvram.c +1 -1
index 8f46e6e394b1..0c2f0a61b0ea 100644
@@ -107,7 +107,7 @@ found:
 	}
 	/* proceed reading data after header */
 	__ioread32_copy(nvram_buf + sizeof(*header), header + 1,
-			DIV_ROUND_UP(nvram_len / 4));
+			DIV_ROUND_UP(nvram_len, 4));
 	nvram_buf[NVRAM_SPACE - 1] = '\0';
 
 	return 0;