Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 111bd981 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John Crispin
Browse files

MIPS: BCM47XX: add bcm47xx prefix in front of nvram function names 



The nvram functions are exported and used by some normal drivers. To
prevent name clashes with ofter parts of the kernel code add a bcm47xx_
prefix in front of the function names and the header file name.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Patchwork: http://patchwork.linux-mips.org/patch/4744/


Signed-off-by: default avatarJohn Crispin <blogic@openwrt.org>
parent f36738dd

arch/mips/bcm47xx/nvram.c

+3 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/kernel.h>

#include <linux/string.h>

#include <asm/addrspace.h>

#include <asm/mach-bcm47xx/nvram.h>

#include <bcm47xx_nvram.h>

#include <asm/mach-bcm47xx/bcm47xx.h>



static char nvram_buf[NVRAM_SPACE];
@@ -159,7 +159,7 @@ static int nvram_init(void) 
	return -ENXIO;

}



int nvram_getenv(char *name, char *val, size_t val_len)

int bcm47xx_nvram_getenv(char *name, char *val, size_t val_len)

{

	char *var, *value, *end, *eq;

	int err;
@@ -189,4 +189,4 @@ int nvram_getenv(char *name, char *val, size_t val_len) 
	}

	return -ENOENT;

}

EXPORT_SYMBOL(nvram_getenv);
 
EXPORT_SYMBOL(bcm47xx_nvram_getenv);

arch/mips/bcm47xx/setup.c

+3 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include <asm/reboot.h>

#include <asm/time.h>

#include <bcm47xx.h>

#include <asm/mach-bcm47xx/nvram.h>

#include <bcm47xx_nvram.h>



union bcm47xx_bus bcm47xx_bus;

EXPORT_SYMBOL(bcm47xx_bus);
@@ -115,7 +115,7 @@ static int bcm47xx_get_invariants(struct ssb_bus *bus, 
	memset(&iv->sprom, 0, sizeof(struct ssb_sprom));

	bcm47xx_fill_sprom(&iv->sprom, NULL, false);



	if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0)

	if (bcm47xx_nvram_getenv("cardbus", buf, sizeof(buf)) >= 0)

		iv->has_cardbus_slot = !!simple_strtoul(buf, NULL, 10);



	return 0;
@@ -138,7 +138,7 @@ static void __init bcm47xx_register_ssb(void) 
		panic("Failed to initialize SSB bus (err %d)", err);



	mcore = &bcm47xx_bus.ssb.mipscore;

	if (nvram_getenv("kernel_args", buf, sizeof(buf)) >= 0) {

	if (bcm47xx_nvram_getenv("kernel_args", buf, sizeof(buf)) >= 0) {

		if (strstr(buf, "console=ttyS1")) {

			struct ssb_serial_port port;

arch/mips/bcm47xx/sprom.c

+4 −4
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
 */



#include <bcm47xx.h>

#include <nvram.h>

#include <bcm47xx_nvram.h>



static void create_key(const char *prefix, const char *postfix,

		       const char *name, char *buf, int len)
@@ -50,10 +50,10 @@ static int get_nvram_var(const char *prefix, const char *postfix, 


	create_key(prefix, postfix, name, key, sizeof(key));



	err = nvram_getenv(key, buf, len);

	err = bcm47xx_nvram_getenv(key, buf, len);

	if (fallback && err == -ENOENT && prefix) {

		create_key(NULL, postfix, name, key, sizeof(key));

		err = nvram_getenv(key, buf, len);

		err = bcm47xx_nvram_getenv(key, buf, len);

	}

	return err;

}
@@ -144,7 +144,7 @@ static void nvram_read_macaddr(const char *prefix, const char *name, 
	if (err < 0)

		return;



	nvram_parse_macaddr(buf, *val);

	bcm47xx_nvram_parse_macaddr(buf, *val);

}



static void nvram_read_alpha2(const char *prefix, const char *name,

arch/mips/include/asm/mach-bcm47xx/nvram.h→arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h

+5 −5
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 
 *  option) any later version.

 */



#ifndef __NVRAM_H

#define __NVRAM_H

#ifndef __BCM47XX_NVRAM_H

#define __BCM47XX_NVRAM_H



#include <linux/types.h>

#include <linux/kernel.h>
@@ -32,9 +32,9 @@ struct nvram_header { 
#define NVRAM_MAX_VALUE_LEN 255

#define NVRAM_MAX_PARAM_LEN 64



extern int nvram_getenv(char *name, char *val, size_t val_len);

extern int bcm47xx_nvram_getenv(char *name, char *val, size_t val_len);



static inline void nvram_parse_macaddr(char *buf, u8 macaddr[6])

static inline void bcm47xx_nvram_parse_macaddr(char *buf, u8 macaddr[6])

{

	if (strchr(buf, ':'))

		sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &macaddr[0],
@@ -48,4 +48,4 @@ static inline void nvram_parse_macaddr(char *buf, u8 macaddr[6]) 
		printk(KERN_WARNING "Can not parse mac address: %s\n", buf);

}



#endif
 
#endif /* __BCM47XX_NVRAM_H */

drivers/mtd/bcm47xxpart.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/slab.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <asm/mach-bcm47xx/nvram.h>

#include <bcm47xx_nvram.h>



/* 10 parts were found on sflash on Netgear WNDR4500 */

#define BCM47XXPART_MAX_PARTS		12