MIPS: BCM47XX: Fix coding style to match kernel standards

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

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Acked-by: Hauke 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: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/bcm47xx/bcm47xx_private.h b/arch/mips/bcm47xx/bcm47xx_private.h
index ea909a5..41796be 100644 (file)
--- a/arch/mips/bcm47xx/bcm47xx_private.h
+++ b/arch/mips/bcm47xx/bcm47xx_private.h
@@ -1,6 +1,10 @@
 #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 */

diff --git a/arch/mips/bcm47xx/board.c b/arch/mips/bcm47xx/board.c
index 6e85130..d4a5a51 100644 (file)
--- a/arch/mips/bcm47xx/board.c
+++ b/arch/mips/bcm47xx/board.c
@@ -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;

diff --cc arch/mips/bcm47xx/nvram.c
Simple merge

diff --cc arch/mips/bcm47xx/prom.c
Simple merge

diff --cc arch/mips/bcm47xx/serial.c
Simple merge

diff --cc arch/mips/bcm47xx/setup.c
Simple merge

diff --cc arch/mips/bcm47xx/sprom.c
Simple merge

diff --cc arch/mips/bcm47xx/time.c
Simple merge