lkml.org 
[lkml]   [2015]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] net: brcm80211: Delete unnecessary checks before two function calls
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Wed, 4 Feb 2015 20:28:49 +0100

    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>
    ---
    drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 3 +--
    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 99a3776..5b5520b 100644
    --- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
    +++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
    @@ -2543,8 +2543,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 4572def..10c684c 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);
    }
    --
    2.2.2


    \
     
     \ /
      Last update: 2015-02-04 21:01    [W:4.020 / U:0.564 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site