Commit bb7410b2 authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman

staging: brcm80211: removed likely/unlikely calls

There was no performance rationale to use these guys.
Reported-by: default avatarDan Carpenter <error27@gmail.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 12e139ff
...@@ -944,7 +944,7 @@ static int brcmf_netdev_open(struct net_device *net) ...@@ -944,7 +944,7 @@ static int brcmf_netdev_open(struct net_device *net)
/* Allow transmit calls */ /* Allow transmit calls */
netif_start_queue(net); netif_start_queue(net);
drvr_priv->pub.up = 1; 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"); brcmf_dbg(ERROR, "failed to bring up cfg80211\n");
return -1; return -1;
} }
...@@ -1054,7 +1054,7 @@ struct brcmf_pub *brcmf_attach(struct brcmf_bus *bus, uint bus_hdrlen) ...@@ -1054,7 +1054,7 @@ struct brcmf_pub *brcmf_attach(struct brcmf_bus *bus, uint bus_hdrlen)
brcmf_cfg80211_attach(net, brcmf_cfg80211_attach(net,
brcmf_bus_get_device(bus), brcmf_bus_get_device(bus),
&drvr_priv->pub); &drvr_priv->pub);
if (unlikely(drvr_priv->pub.config == NULL)) { if (drvr_priv->pub.config == NULL) {
brcmf_dbg(ERROR, "wl_cfg80211_attach failed\n"); brcmf_dbg(ERROR, "wl_cfg80211_attach failed\n");
goto fail; goto fail;
} }
......
...@@ -1132,7 +1132,7 @@ brcms_c_ampdu_dotxstatus(struct ampdu_info *ampdu, struct scb *scb, ...@@ -1132,7 +1132,7 @@ brcms_c_ampdu_dotxstatus(struct ampdu_info *ampdu, struct scb *scb,
s2 = R_REG(&wlc->regs->frmtxstatus2); s2 = R_REG(&wlc->regs->frmtxstatus2);
} }
if (likely(scb)) { if (scb) {
scb_ampdu = &scb->scb_ampdu; scb_ampdu = &scb->scb_ampdu;
ini = &scb_ampdu->ini[p->priority]; ini = &scb_ampdu->ini[p->priority];
brcms_c_ampdu_dotxstatus_complete(ampdu, scb, p, txs, s1, s2); brcms_c_ampdu_dotxstatus_complete(ampdu, scb, p, txs, s1, s2);
......
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