lkml.org 
[lkml]   [2015]   [Jun]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 1/2] staging: wilc1000: Delete unnecessary checks before two function calls
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Sat, 27 Jun 2015 15:56:57 +0200

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

    This issue was detected by using the Coccinelle software.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    drivers/staging/wilc1000/linux_wlan.c | 9 ++-------
    1 file changed, 2 insertions(+), 7 deletions(-)

    diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
    index b352c50..2aa8d9b 100644
    --- a/drivers/staging/wilc1000/linux_wlan.c
    +++ b/drivers/staging/wilc1000/linux_wlan.c
    @@ -2421,11 +2421,7 @@ int mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd)
    }

    done:
    -
    - if (buff != NULL) {
    - kfree(buff);
    - }
    -
    + kfree(buff);
    return s32Error;
    }

    @@ -2707,8 +2703,7 @@ static void __exit exit_wilc_driver(void)
    }
    }

    -
    - if ((g_linux_wlan != NULL) && g_linux_wlan->wilc_firmware != NULL) {
    + if (g_linux_wlan) {
    release_firmware(g_linux_wlan->wilc_firmware);
    g_linux_wlan->wilc_firmware = NULL;
    }
    --
    2.4.4


    \
     
     \ /
      Last update: 2015-06-27 17:01    [W:4.021 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site