FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-15 13:22:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: brcm80211: fixed checkpatch warnings

Browse Source 
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alwin Beukers 2011-10-04 23:18:56 +02:00 committed by Greg Kroah-Hartman
parent ef8299ddee
commit 406f8d656c
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/brcm80211/brcmsmac/aiutils.c
View File

@ -1054,9 +1054,8 @@ static struct si_info *ai_doattach(struct si_info *sii,
cc = (struct chipcregs __iomem *) regs; cc = (struct chipcregs __iomem *) regs;
/* bus/core/clk setup for register access */ /* bus/core/clk setup for register access */
if (!ai_buscore_prep(sii)) { if (!ai_buscore_prep(sii))
return NULL; return NULL;
}
/* /*
* ChipID recognition. * ChipID recognition.
@ -1084,19 +1083,18 @@ static struct si_info *ai_doattach(struct si_info *sii,
return NULL; return NULL;
} }
/* no cores found, bail out */ /* no cores found, bail out */
if (sii->numcores == 0) { if (sii->numcores == 0)
return NULL; return NULL;
}
/* bus/core/clk setup */ /* bus/core/clk setup */
origidx = SI_CC_IDX; origidx = SI_CC_IDX;
if (!ai_buscore_setup(sii, savewin, &origidx)) { if (!ai_buscore_setup(sii, savewin, &origidx))
goto exit; goto exit;
}
/* Init nvram from sprom/otp if they exist */ /* Init nvram from sprom/otp if they exist */
if (srom_var_init(&sii->pub, cc, vars, varsz)) { if (srom_var_init(&sii->pub, cc, vars, varsz))
goto exit; goto exit;
}
pvars = vars ? *vars : NULL; pvars = vars ? *vars : NULL;
ai_nvram_process(sii, pvars); ai_nvram_process(sii, pvars);

3
drivers/staging/brcm80211/brcmsmac/main.c
View File

@ -5995,9 +5995,8 @@ int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config)
* If we are switching to gmode == GMODE_LEGACY_B, * If we are switching to gmode == GMODE_LEGACY_B,
* clean up rate info that may refer to OFDM rates. * clean up rate info that may refer to OFDM rates.
*/ */
if ((gmode == GMODE_LEGACY_B) && (band->gmode != GMODE_LEGACY_B)) { if ((gmode == GMODE_LEGACY_B) && (band->gmode != GMODE_LEGACY_B))
band->gmode = gmode; band->gmode = gmode;
}
band->gmode = gmode; band->gmode = gmode;

3
drivers/staging/brcm80211/brcmsmac/nicpci.c
View File

@ -394,9 +394,8 @@ static bool pcie_mdiosetblock(struct pcicore_info *pi, uint blk)
i++; i++;
} }
if (i >= pcie_serdes_spinwait) { if (i >= pcie_serdes_spinwait)
return false; return false;
}
return true; return true;
} }

3
drivers/staging/brcm80211/brcmsmac/srom.c
View File

@ -1175,8 +1175,7 @@ static int initvars_srom_pci(struct si_pub *sih, void __iomem *curmap,
if (sromrev == 0x10) if (sromrev == 0x10)
sromrev = 1; sromrev = 1;
} }
} } else {
else {
/* Use OTP if SPROM not available */ /* Use OTP if SPROM not available */
err = otp_read_pci(sih, srom, SROM_MAX); err = otp_read_pci(sih, srom, SROM_MAX);
if (err == 0) if (err == 0)