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

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

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

drivers/net/wireless/brcm80211/brcmfmac/firmware.c

+1 −2
Original line number Diff line number Diff line
@@ -262,7 +262,6 @@ static void brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx) 


fail:

	brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev));

	if (fwctx->code)

	release_firmware(fwctx->code);

	device_release_driver(fwctx->dev);

	kfree(fwctx);

drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c

+1 −2
Original line number Diff line number Diff line
@@ -518,7 +518,6 @@ static int brcmf_msgbuf_query_dcmd(struct brcmf_pub *drvr, int ifidx, 
		memcpy(buf, skb->data, (len < msgbuf->ioctl_resp_ret_len) ?

				       len : msgbuf->ioctl_resp_ret_len);

	}

	if (skb)

	brcmu_pkt_buf_free_skb(skb);



	return msgbuf->ioctl_resp_status;

drivers/net/wireless/brcm80211/brcmsmac/main.c

+1 −2
Original line number Diff line number Diff line
@@ -1009,7 +1009,6 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct tx_status *txs) 
		if (txh)

			trace_brcms_txdesc(&wlc->hw->d11core->dev, txh,

					   sizeof(*txh));

		if (p)

		brcmu_pkt_buf_free_skb(p);

	}