diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2014-12-10 11:38:26 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2015-04-01 11:22:10 -0400 |
commit | d548ca6b0784a99f0fcae397f115823ccd0361a5 (patch) | |
tree | 17a178461b3762bc78c301892abeeec4fcaf7d16 /arch/mips/bcm47xx/board.c | |
parent | 05f5507f59d6d3eab1c2172c6266b664b61599b5 (diff) |
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>
Diffstat (limited to 'arch/mips/bcm47xx/board.c')
-rw-r--r-- | arch/mips/bcm47xx/board.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/bcm47xx/board.c b/arch/mips/bcm47xx/board.c index 6e8513068325..d4a5a51ce232 100644 --- a/arch/mips/bcm47xx/board.c +++ b/arch/mips/bcm47xx/board.c | |||
@@ -330,9 +330,8 @@ void __init bcm47xx_board_detect(void) | |||
330 | err = bcm47xx_nvram_getenv("boardtype", buf, sizeof(buf)); | 330 | err = bcm47xx_nvram_getenv("boardtype", buf, sizeof(buf)); |
331 | 331 | ||
332 | /* init of nvram failed, probably too early now */ | 332 | /* init of nvram failed, probably too early now */ |
333 | if (err == -ENXIO) { | 333 | if (err == -ENXIO) |
334 | return; | 334 | return; |
335 | } | ||
336 | 335 | ||
337 | board_detected = bcm47xx_board_get_nvram(); | 336 | board_detected = bcm47xx_board_get_nvram(); |
338 | bcm47xx_board.board = board_detected->board; | 337 | bcm47xx_board.board = board_detected->board; |