Commit b0a119fd authored Jan 27, 2016 by Ralf Baechle

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



This reverts commit 5bdb102b.

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

parent 92e963f5

arch/mips/bcm63xx/nvram.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,8 @@

		#include <bcm63xx_nvram.h>

		#define BCM63XX_DEFAULT_PSI_SIZE 64

		static struct bcm963xx_nvram nvram;
		static int mac_addr_used;

		@@ -85,3 +87,12 @@ int bcm63xx_nvram_get_mac_address(u8 *mac)
		return 0;
		}
		EXPORT_SYMBOL(bcm63xx_nvram_get_mac_address);

		int bcm63xx_nvram_get_psi_size(void)
		{
		if (nvram.psi_size > 0)
		return nvram.psi_size;

		return BCM63XX_DEFAULT_PSI_SIZE;
		}
		EXPORT_SYMBOL(bcm63xx_nvram_get_psi_size);

arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -30,4 +30,6 @@ u8 *bcm63xx_nvram_get_name(void);
		*/
		int bcm63xx_nvram_get_mac_address(u8 *mac);

		int bcm63xx_nvram_get_psi_size(void);

		#endif /* BCM63XX_NVRAM_H */

Admin message