diff options
| author | Markus Elfring <elfring@users.sourceforge.net> | 2015-02-04 20:28:49 +0100 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2015-02-06 08:52:50 +0200 |
| commit | 297540f69fa9c7292c9866e71cb22a7bc4c5003b (patch) | |
| tree | 39f7dcb30f05d95b5273f5ce23833e8564ef9761 | |
| parent | 6f24fe305986afcb9eb2bde1031798b3b2ebf649 (diff) | |
| download | op-kernel-dev-297540f69fa9c7292c9866e71cb22a7bc4c5003b.zip op-kernel-dev-297540f69fa9c7292c9866e71cb22a7bc4c5003b.tar.gz | |
brcm80211: Delete unnecessary checks before two function calls
The functions brcmu_pkt_buf_free_skb() and usb_free_urb() test whether
their argument is NULL and then return immediately. Thus the test around
the call is not needed.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 3 | ||||
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/usb.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c index 5e9d208..faec35c 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c @@ -2538,8 +2538,7 @@ static void brcmf_sdio_bus_stop(struct device *dev) brcmu_pktq_flush(&bus->txq, true, NULL, NULL); /* Clear any held glomming stuff */ - if (bus->glomd) - brcmu_pkt_buf_free_skb(bus->glomd); + brcmu_pkt_buf_free_skb(bus->glomd); brcmf_sdio_free_glom(bus); /* Clear rx control and wake any waiters */ diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c index 1b95729..5df6aa7 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c @@ -421,7 +421,7 @@ fail: brcmf_err("fail!\n"); while (!list_empty(q)) { req = list_entry(q->next, struct brcmf_usbreq, list); - if (req && req->urb) + if (req) usb_free_urb(req->urb); list_del(q->next); } |
