Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Revert "MIPS: bcm63xx: nvram: Remove unused bcm63xx_nvram_get_psi_size() function"

This reverts commit 5bdb102b3f9785cb88467bc7c75fa0f5cacc8dc5.

Brian Norris <computersforpeace@gmail.com> is reporting:

Ralf,

Please revert this and send it to Linus (or else, I can send it myself).
This is causing build failures, because I didn't take the rest of
Simon's series yet.

drivers/mtd/bcm63xxpart.c: In function 'bcm63xx_parse_cfe_partitions':
drivers/mtd/bcm63xxpart.c:93:2: error: implicit declaration of function
'bcm63xx_nvram_get_psi_size' [-Werror=implicit-function-declaration]

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
References: https://www.linux-mips.org/cgi-bin/mesg.cgi?a=linux-mips&i=20160126191607.GA111152%40google.com

+13
+11
arch/mips/bcm63xx/nvram.c
··· 19 19 20 20 #include <bcm63xx_nvram.h> 21 21 22 + #define BCM63XX_DEFAULT_PSI_SIZE 64 23 + 22 24 static struct bcm963xx_nvram nvram; 23 25 static int mac_addr_used; 24 26 ··· 87 85 return 0; 88 86 } 89 87 EXPORT_SYMBOL(bcm63xx_nvram_get_mac_address); 88 + 89 + int bcm63xx_nvram_get_psi_size(void) 90 + { 91 + if (nvram.psi_size > 0) 92 + return nvram.psi_size; 93 + 94 + return BCM63XX_DEFAULT_PSI_SIZE; 95 + } 96 + EXPORT_SYMBOL(bcm63xx_nvram_get_psi_size);
+2
arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h
··· 30 30 */ 31 31 int bcm63xx_nvram_get_mac_address(u8 *mac); 32 32 33 + int bcm63xx_nvram_get_psi_size(void); 34 + 33 35 #endif /* BCM63XX_NVRAM_H */