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

Commit bb7410b2 authored Sep 22, 2011 by Roland Vossen Committed by Greg Kroah-Hartman Sep 26, 2011

staging: brcm80211: removed likely/unlikely calls



There was no performance rationale to use these guys.

Reported-by: Dan Carpenter <error27@gmail.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent 12e139ff

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -944,7 +944,7 @@ static int brcmf_netdev_open(struct net_device *net)
		/* Allow transmit calls */
		netif_start_queue(net);
		drvr_priv->pub.up = 1;
		if (unlikely(brcmf_cfg80211_up(drvr_priv->pub.config))) {
		if (brcmf_cfg80211_up(drvr_priv->pub.config)) {
		brcmf_dbg(ERROR, "failed to bring up cfg80211\n");
		return -1;
		}
		@@ -1054,7 +1054,7 @@ struct brcmf_pub brcmf_attach(struct brcmf_bus bus, uint bus_hdrlen)
		brcmf_cfg80211_attach(net,
		brcmf_bus_get_device(bus),
		&drvr_priv->pub);
		if (unlikely(drvr_priv->pub.config == NULL)) {
		if (drvr_priv->pub.config == NULL) {
		brcmf_dbg(ERROR, "wl_cfg80211_attach failed\n");
		goto fail;
		}

drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c

+104 −107

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/brcm80211/brcmsmac/ampdu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1132,7 +1132,7 @@ brcms_c_ampdu_dotxstatus(struct ampdu_info ampdu, struct scb scb,
		s2 = R_REG(&wlc->regs->frmtxstatus2);
		}

		if (likely(scb)) {
		if (scb) {
		scb_ampdu = &scb->scb_ampdu;
		ini = &scb_ampdu->ini[p->priority];
		brcms_c_ampdu_dotxstatus_complete(ampdu, scb, p, txs, s1, s2);