lkml.org 
[lkml]   [2015]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH] staging-EHCA: Delete unnecessary checks before the function call "kmem_cache_destroy"
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Sun, 15 Nov 2015 21:58:45 +0100

    The kmem_cache_destroy() function tests whether its argument is NULL
    and then returns 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/rdma/ehca/ehca_av.c | 3 +--
    drivers/staging/rdma/ehca/ehca_cq.c | 3 +--
    drivers/staging/rdma/ehca/ehca_main.c | 3 +--
    drivers/staging/rdma/ehca/ehca_mrmw.c | 6 ++----
    drivers/staging/rdma/ehca/ehca_pd.c | 3 +--
    drivers/staging/rdma/ehca/ehca_qp.c | 3 +--
    6 files changed, 7 insertions(+), 14 deletions(-)

    diff --git a/drivers/staging/rdma/ehca/ehca_av.c b/drivers/staging/rdma/ehca/ehca_av.c
    index 4659263..04b9398 100644
    --- a/drivers/staging/rdma/ehca/ehca_av.c
    +++ b/drivers/staging/rdma/ehca/ehca_av.c
    @@ -272,6 +272,5 @@ int ehca_init_av_cache(void)

    void ehca_cleanup_av_cache(void)
    {
    - if (av_cache)
    - kmem_cache_destroy(av_cache);
    + kmem_cache_destroy(av_cache);
    }
    diff --git a/drivers/staging/rdma/ehca/ehca_cq.c b/drivers/staging/rdma/ehca/ehca_cq.c
    index ea1b5c1..1aa7931 100644
    --- a/drivers/staging/rdma/ehca/ehca_cq.c
    +++ b/drivers/staging/rdma/ehca/ehca_cq.c
    @@ -393,6 +393,5 @@ int ehca_init_cq_cache(void)

    void ehca_cleanup_cq_cache(void)
    {
    - if (cq_cache)
    - kmem_cache_destroy(cq_cache);
    + kmem_cache_destroy(cq_cache);
    }
    diff --git a/drivers/staging/rdma/ehca/ehca_main.c b/drivers/staging/rdma/ehca/ehca_main.c
    index 8246418..860b974 100644
    --- a/drivers/staging/rdma/ehca/ehca_main.c
    +++ b/drivers/staging/rdma/ehca/ehca_main.c
    @@ -245,8 +245,7 @@ static void ehca_destroy_slab_caches(void)
    ehca_cleanup_cq_cache();
    ehca_cleanup_pd_cache();
    #ifdef CONFIG_PPC_64K_PAGES
    - if (ctblk_cache)
    - kmem_cache_destroy(ctblk_cache);
    + kmem_cache_destroy(ctblk_cache);
    #endif
    }

    diff --git a/drivers/staging/rdma/ehca/ehca_mrmw.c b/drivers/staging/rdma/ehca/ehca_mrmw.c
    index f914b30..553e883 100644
    --- a/drivers/staging/rdma/ehca/ehca_mrmw.c
    +++ b/drivers/staging/rdma/ehca/ehca_mrmw.c
    @@ -2251,10 +2251,8 @@ int ehca_init_mrmw_cache(void)

    void ehca_cleanup_mrmw_cache(void)
    {
    - if (mr_cache)
    - kmem_cache_destroy(mr_cache);
    - if (mw_cache)
    - kmem_cache_destroy(mw_cache);
    + kmem_cache_destroy(mr_cache);
    + kmem_cache_destroy(mw_cache);
    }

    static inline int ehca_init_top_bmap(struct ehca_top_bmap *ehca_top_bmap,
    diff --git a/drivers/staging/rdma/ehca/ehca_pd.c b/drivers/staging/rdma/ehca/ehca_pd.c
    index 351577a..2a8aae4 100644
    --- a/drivers/staging/rdma/ehca/ehca_pd.c
    +++ b/drivers/staging/rdma/ehca/ehca_pd.c
    @@ -119,6 +119,5 @@ int ehca_init_pd_cache(void)

    void ehca_cleanup_pd_cache(void)
    {
    - if (pd_cache)
    - kmem_cache_destroy(pd_cache);
    + kmem_cache_destroy(pd_cache);
    }
    diff --git a/drivers/staging/rdma/ehca/ehca_qp.c b/drivers/staging/rdma/ehca/ehca_qp.c
    index 2e89356..896c01f 100644
    --- a/drivers/staging/rdma/ehca/ehca_qp.c
    +++ b/drivers/staging/rdma/ehca/ehca_qp.c
    @@ -2252,6 +2252,5 @@ int ehca_init_qp_cache(void)

    void ehca_cleanup_qp_cache(void)
    {
    - if (qp_cache)
    - kmem_cache_destroy(qp_cache);
    + kmem_cache_destroy(qp_cache);
    }
    --
    2.6.2


    \
     
     \ /
      Last update: 2015-11-15 22:21    [W:4.358 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site