Commit 2f94acde authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Ralf Baechle

MIPS: BCM47xx: Fix some WARNINGs pointed in sprom.c by checkpatch.pl

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: default avatarRafał 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: default avatarRalf Baechle <ralf@linux-mips.org>
parent daa7ce02
...@@ -60,9 +60,9 @@ static int get_nvram_var(const char *prefix, const char *postfix, ...@@ -60,9 +60,9 @@ static int get_nvram_var(const char *prefix, const char *postfix,
} }
#define NVRAM_READ_VAL(type) \ #define NVRAM_READ_VAL(type) \
static void nvram_read_ ## type (const char *prefix, \ static void nvram_read_ ## type(const char *prefix, \
const char *postfix, const char *name, \ const char *postfix, const char *name, \
type *val, type allset, bool fallback) \ type *val, type allset, bool fallback) \
{ \ { \
char buf[100]; \ char buf[100]; \
int err; \ int err; \
...@@ -422,7 +422,10 @@ static void bcm47xx_fill_sprom_path_r4589(struct ssb_sprom *sprom, ...@@ -422,7 +422,10 @@ static void bcm47xx_fill_sprom_path_r4589(struct ssb_sprom *sprom,
int i; int i;
for (i = 0; i < ARRAY_SIZE(sprom->core_pwr_info); 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); snprintf(postfix, sizeof(postfix), "%i", i);
nvram_read_u8(prefix, postfix, "maxp2ga", nvram_read_u8(prefix, postfix, "maxp2ga",
&pwr_info->maxpwr_2g, 0, fallback); &pwr_info->maxpwr_2g, 0, fallback);
...@@ -470,7 +473,10 @@ static void bcm47xx_fill_sprom_path_r45(struct ssb_sprom *sprom, ...@@ -470,7 +473,10 @@ static void bcm47xx_fill_sprom_path_r45(struct ssb_sprom *sprom,
int i; int i;
for (i = 0; i < ARRAY_SIZE(sprom->core_pwr_info); 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); snprintf(postfix, sizeof(postfix), "%i", i);
nvram_read_u16(prefix, postfix, "pa2gw3a", nvram_read_u16(prefix, postfix, "pa2gw3a",
&pwr_info->pa_2g[3], 0, fallback); &pwr_info->pa_2g[3], 0, fallback);
...@@ -535,10 +541,11 @@ static void bcm47xx_fill_sprom_ethernet(struct ssb_sprom *sprom, ...@@ -535,10 +541,11 @@ static void bcm47xx_fill_sprom_ethernet(struct ssb_sprom *sprom,
nvram_read_macaddr(prefix, "il0macaddr", sprom->il0mac, fallback); nvram_read_macaddr(prefix, "il0macaddr", sprom->il0mac, fallback);
/* The address prefix 00:90:4C is used by Broadcom in their initial /* 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 * 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. * all devices from the same series are sharing the same mac address.
To prevent mac address collisions we replace them with a mac address * To prevent mac address collisions we replace them with a mac address
based on the base address. */ * based on the base address.
*/
if (!bcm47xx_is_valid_mac(sprom->il0mac)) { if (!bcm47xx_is_valid_mac(sprom->il0mac)) {
u8 mac[6]; u8 mac[6];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment