f0a5f24217
- two upstreamed patches removed - compile tested all targets using 4.1 - run tested ar71xx Signed-off-by: Roman Yeryomin <roman@advem.lv> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 47694
77 lines
2.9 KiB
Diff
77 lines
2.9 KiB
Diff
From 2f94acde42b70c81129b398c44aa09411974a16d Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
|
Date: Sun, 25 Oct 2015 22:16:48 +0100
|
|
Subject: [PATCH 2/3] MIPS: BCM47xx: Fix some WARNINGs pointed in sprom.c by
|
|
checkpatch.pl
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
There are still few left:
|
|
1) Most of them about lines over 80 chars (increased readability exception)
|
|
2) Wrong parsing of preprocessor macros
|
|
|
|
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
|
Cc: linux-mips@linux-mips.org
|
|
Cc: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Patchwork: https://patchwork.linux-mips.org/patch/11356/
|
|
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
|
---
|
|
arch/mips/bcm47xx/sprom.c | 25 ++++++++++++++++---------
|
|
1 file changed, 16 insertions(+), 9 deletions(-)
|
|
|
|
--- a/arch/mips/bcm47xx/sprom.c
|
|
+++ b/arch/mips/bcm47xx/sprom.c
|
|
@@ -60,9 +60,9 @@ static int get_nvram_var(const char *pre
|
|
}
|
|
|
|
#define NVRAM_READ_VAL(type) \
|
|
-static void nvram_read_ ## type (const char *prefix, \
|
|
- const char *postfix, const char *name, \
|
|
- type *val, type allset, bool fallback) \
|
|
+static void nvram_read_ ## type(const char *prefix, \
|
|
+ const char *postfix, const char *name, \
|
|
+ type *val, type allset, bool fallback) \
|
|
{ \
|
|
char buf[100]; \
|
|
int err; \
|
|
@@ -422,7 +422,10 @@ static void bcm47xx_fill_sprom_path_r458
|
|
int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(sprom->core_pwr_info); i++) {
|
|
- struct ssb_sprom_core_pwr_info *pwr_info = &sprom->core_pwr_info[i];
|
|
+ struct ssb_sprom_core_pwr_info *pwr_info;
|
|
+
|
|
+ pwr_info = &sprom->core_pwr_info[i];
|
|
+
|
|
snprintf(postfix, sizeof(postfix), "%i", i);
|
|
nvram_read_u8(prefix, postfix, "maxp2ga",
|
|
&pwr_info->maxpwr_2g, 0, fallback);
|
|
@@ -470,7 +473,10 @@ static void bcm47xx_fill_sprom_path_r45(
|
|
int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(sprom->core_pwr_info); i++) {
|
|
- struct ssb_sprom_core_pwr_info *pwr_info = &sprom->core_pwr_info[i];
|
|
+ struct ssb_sprom_core_pwr_info *pwr_info;
|
|
+
|
|
+ pwr_info = &sprom->core_pwr_info[i];
|
|
+
|
|
snprintf(postfix, sizeof(postfix), "%i", i);
|
|
nvram_read_u16(prefix, postfix, "pa2gw3a",
|
|
&pwr_info->pa_2g[3], 0, fallback);
|
|
@@ -535,10 +541,11 @@ static void bcm47xx_fill_sprom_ethernet(
|
|
nvram_read_macaddr(prefix, "il0macaddr", sprom->il0mac, fallback);
|
|
|
|
/* The address prefix 00:90:4C is used by Broadcom in their initial
|
|
- configuration. When a mac address with the prefix 00:90:4C is used
|
|
- all devices from the same series are sharing the same mac address.
|
|
- To prevent mac address collisions we replace them with a mac address
|
|
- based on the base address. */
|
|
+ * configuration. When a mac address with the prefix 00:90:4C is used
|
|
+ * all devices from the same series are sharing the same mac address.
|
|
+ * To prevent mac address collisions we replace them with a mac address
|
|
+ * based on the base address.
|
|
+ */
|
|
if (!bcm47xx_is_valid_mac(sprom->il0mac)) {
|
|
u8 mac[6];
|
|
|