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

Commit d548ca6b authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Ralf Baechle
Browse files

MIPS: BCM47XX: Fix coding style to match kernel standards 



[ralf@linux-mips.org: Fixed conflicts.]

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Acked-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Cc: linux-mips@linux-mips.org
Cc: Paul Walmsley <paul@pwsan.com>
Patchwork: https://patchwork.linux-mips.org/patch/8665/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 05f5507f

arch/mips/bcm47xx/bcm47xx_private.h

+4 −0
Original line number Diff line number Diff line 
#ifndef LINUX_BCM47XX_PRIVATE_H_

#define LINUX_BCM47XX_PRIVATE_H_



#ifndef pr_fmt

#define pr_fmt(fmt)		"bcm47xx: " fmt

#endif



#include <linux/kernel.h>



/* prom.c */

arch/mips/bcm47xx/board.c

+1 −2
Original line number Diff line number Diff line
@@ -330,9 +330,8 @@ void __init bcm47xx_board_detect(void) 
	err = bcm47xx_nvram_getenv("boardtype", buf, sizeof(buf));



	/* init of nvram failed, probably too early now */

	if (err == -ENXIO) {

	if (err == -ENXIO)

		return;

	}



	board_detected = bcm47xx_board_get_nvram();

	bcm47xx_board.board = board_detected->board;

arch/mips/bcm47xx/nvram.c

+14 −11
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 


#define NVRAM_MAGIC			0x48534C46	/* 'FLSH' */

#define NVRAM_SPACE			0x8000

#define NVRAM_MAX_GPIO_ENTRIES		32

#define NVRAM_MAX_GPIO_VALUE_LEN	30



#define FLASH_MIN		0x00020000	/* Minimum flash size */
@@ -189,7 +191,8 @@ int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len) 
	/* Look for name=value and return value */

	var = &nvram_buf[sizeof(struct nvram_header)];

	end = nvram_buf + sizeof(nvram_buf) - 2;

	end[0] = end[1] = '\0';

	end[0] = '\0';

	end[1] = '\0';

	for (; *var; var = value + strlen(value) + 1) {

		data_left = end - var;
@@ -197,11 +200,10 @@ int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len) 
		if (!eq)

			break;

		value = eq + 1;

		if ((eq - var) == strlen(name) &&

			strncmp(var, name, (eq - var)) == 0) {

		if (eq - var == strlen(name) &&

		    strncmp(var, name, eq - var) == 0)

			return snprintf(val, val_len, "%s", value);

		}

	}

	return -ENOENT;

}

EXPORT_SYMBOL(bcm47xx_nvram_getenv);
@@ -209,10 +211,11 @@ EXPORT_SYMBOL(bcm47xx_nvram_getenv); 
int bcm47xx_nvram_gpio_pin(const char *name)

{

	int i, err;

	char nvram_var[10];

	char buf[30];

	char nvram_var[] = "gpioXX";

	char buf[NVRAM_MAX_GPIO_VALUE_LEN];



	for (i = 0; i < 32; i++) {

	/* TODO: Optimize it to don't call getenv so many times */

	for (i = 0; i < NVRAM_MAX_GPIO_ENTRIES; i++) {

		err = snprintf(nvram_var, sizeof(nvram_var), "gpio%i", i);

		if (err <= 0)

			continue;

arch/mips/bcm47xx/prom.c

+1 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <bcm47xx.h>

#include <bcm47xx_board.h>





static char bcm47xx_system_type[20] = "Broadcom BCM47XX";



const char *get_system_type(void)
@@ -83,7 +82,7 @@ static __init void prom_init_mem(void) 
		/* Loop condition may be not enough, off may be over 1 MiB */

		if (off + mem >= max) {

			mem = max;

			printk(KERN_DEBUG "assume 128MB RAM\n");

			pr_debug("Assume 128MB RAM\n");

			break;

		}

		if (!memcmp(prom_init, prom_init + mem, 32))

arch/mips/bcm47xx/setup.c

+6 −6
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ EXPORT_SYMBOL(bcm47xx_bus_type); 


static void bcm47xx_machine_restart(char *command)

{

	printk(KERN_ALERT "Please stand by while rebooting the system...\n");

	pr_alert("Please stand by while rebooting the system...\n");

	local_irq_disable();

	/* Set the watchdog timer to reset immediately */

	switch (bcm47xx_bus_type) {
@@ -107,7 +107,7 @@ static int bcm47xx_get_invariants(struct ssb_bus *bus, 
	char buf[20];



	/* Fill boardinfo structure */

	memset(&(iv->boardinfo), 0 , sizeof(struct ssb_boardinfo));

	memset(&iv->boardinfo, 0 , sizeof(struct ssb_boardinfo));



	bcm47xx_fill_ssb_boardinfo(&iv->boardinfo, NULL);
@@ -126,7 +126,7 @@ static void __init bcm47xx_register_ssb(void) 
	char buf[100];

	struct ssb_mipscore *mcore;



	err = ssb_bus_ssbbus_register(&(bcm47xx_bus.ssb), SSB_ENUM_BASE,

	err = ssb_bus_ssbbus_register(&bcm47xx_bus.ssb, SSB_ENUM_BASE,

				      bcm47xx_get_invariants);

	if (err)

		panic("Failed to initialize SSB bus (err %d)", err);
@@ -136,7 +136,7 @@ static void __init bcm47xx_register_ssb(void) 
		if (strstr(buf, "console=ttyS1")) {

			struct ssb_serial_port port;



			printk(KERN_DEBUG "Swapping serial ports!\n");

			pr_debug("Swapping serial ports!\n");

			/* swap serial ports */

			memcpy(&port, &mcore->serial_ports[0], sizeof(port));

			memcpy(&mcore->serial_ports[0], &mcore->serial_ports[1],
@@ -168,7 +168,7 @@ void __init plat_mem_setup(void) 
	struct cpuinfo_mips *c = &current_cpu_data;



	if ((c->cputype == CPU_74K) || (c->cputype == CPU_1074K)) {

		printk(KERN_INFO "bcm47xx: using bcma bus\n");

		pr_info("Using bcma bus\n");

#ifdef CONFIG_BCM47XX_BCMA

		bcm47xx_bus_type = BCM47XX_BUS_TYPE_BCMA;

		bcm47xx_sprom_register_fallbacks();
@@ -179,7 +179,7 @@ void __init plat_mem_setup(void) 
#endif

#endif

	} else {

		printk(KERN_INFO "bcm47xx: using ssb bus\n");

		pr_info("Using ssb bus\n");

#ifdef CONFIG_BCM47XX_SSB

		bcm47xx_bus_type = BCM47XX_BUS_TYPE_SSB;

		bcm47xx_sprom_register_fallbacks();