Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 406f8d65 authored by Alwin Beukers's avatar Alwin Beukers Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: fixed checkpatch warnings 



Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ef8299dd

drivers/staging/brcm80211/brcmsmac/aiutils.c

+6 −8
Original line number Diff line number Diff line
@@ -1054,9 +1054,8 @@ static struct si_info *ai_doattach(struct si_info *sii, 
	cc = (struct chipcregs __iomem *) regs;



	/* bus/core/clk setup for register access */

	if (!ai_buscore_prep(sii)) {

	if (!ai_buscore_prep(sii))

		return NULL;

	}



	/*

	 * ChipID recognition.
@@ -1084,19 +1083,18 @@ static struct si_info *ai_doattach(struct si_info *sii, 
		return NULL;

	}

	/* no cores found, bail out */

	if (sii->numcores == 0) {

	if (sii->numcores == 0)

		return NULL;

	}



	/* bus/core/clk setup */

	origidx = SI_CC_IDX;

	if (!ai_buscore_setup(sii, savewin, &origidx)) {

	if (!ai_buscore_setup(sii, savewin, &origidx))

		goto exit;

	}



	/* 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;

	}



	pvars = vars ? *vars : NULL;

	ai_nvram_process(sii, pvars);

drivers/staging/brcm80211/brcmsmac/main.c

+1 −2
Original line number Diff line number Diff line
@@ -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,

	 * 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;

drivers/staging/brcm80211/brcmsmac/nicpci.c

+1 −2
Original line number Diff line number Diff line
@@ -394,9 +394,8 @@ static bool pcie_mdiosetblock(struct pcicore_info *pi, uint blk) 
		i++;

	}



	if (i >= pcie_serdes_spinwait) {

	if (i >= pcie_serdes_spinwait)

		return false;

	}



	return true;

}

drivers/staging/brcm80211/brcmsmac/srom.c

+1 −2
Original line number Diff line number Diff line
@@ -1175,8 +1175,7 @@ static int initvars_srom_pci(struct si_pub *sih, void __iomem *curmap, 
			if (sromrev == 0x10)

				sromrev = 1;

		}

	}

	else {

	} else {

		/* Use OTP if SPROM not available */

		err = otp_read_pci(sih, srom, SROM_MAX);

		if (err == 0)