Commit ac96ce83 authored by Markus Elfring's avatar Markus Elfring Committed by John W. Linville

net: brcm80211: Deletion of unnecessary checks before two function calls

The functions brcmu_pkt_buf_free_skb() and release_firmware() test whether
their argument is NULL and then return immediately. Thus the test around
the call is not needed.

This issue was detected by using the Coccinelle software.
Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Acked-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9a638ddf
...@@ -262,8 +262,7 @@ static void brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx) ...@@ -262,8 +262,7 @@ static void brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx)
fail: fail:
brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev)); brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev));
if (fwctx->code) release_firmware(fwctx->code);
release_firmware(fwctx->code);
device_release_driver(fwctx->dev); device_release_driver(fwctx->dev);
kfree(fwctx); kfree(fwctx);
} }
......
...@@ -518,8 +518,7 @@ static int brcmf_msgbuf_query_dcmd(struct brcmf_pub *drvr, int ifidx, ...@@ -518,8 +518,7 @@ static int brcmf_msgbuf_query_dcmd(struct brcmf_pub *drvr, int ifidx,
memcpy(buf, skb->data, (len < msgbuf->ioctl_resp_ret_len) ? memcpy(buf, skb->data, (len < msgbuf->ioctl_resp_ret_len) ?
len : msgbuf->ioctl_resp_ret_len); len : msgbuf->ioctl_resp_ret_len);
} }
if (skb) brcmu_pkt_buf_free_skb(skb);
brcmu_pkt_buf_free_skb(skb);
return msgbuf->ioctl_resp_status; return msgbuf->ioctl_resp_status;
} }
......
...@@ -1009,8 +1009,7 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct tx_status *txs) ...@@ -1009,8 +1009,7 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct tx_status *txs)
if (txh) if (txh)
trace_brcms_txdesc(&wlc->hw->d11core->dev, txh, trace_brcms_txdesc(&wlc->hw->d11core->dev, txh,
sizeof(*txh)); sizeof(*txh));
if (p) brcmu_pkt_buf_free_skb(p);
brcmu_pkt_buf_free_skb(p);
} }
if (dma && queue < NFIFO) { if (dma && queue < NFIFO) {
......
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