lkml.org 
[lkml]   [2014]   [Nov]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 1/1] ALSA: core: Deletion of unnecessary checks before two function calls
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Fri, 21 Nov 2014 18:34:48 +0100

    The functions snd_seq_oss_timer_delete() and vunmap() perform also input
    parameter validation. Thus the test around the call is not needed.

    This issue was detected by using the Coccinelle software.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    sound/core/seq/oss/seq_oss_init.c | 9 +++------
    sound/core/sgbuf.c | 3 +--
    2 files changed, 4 insertions(+), 8 deletions(-)

    diff --git a/sound/core/seq/oss/seq_oss_init.c b/sound/core/seq/oss/seq_oss_init.c
    index b9184d2..b0e32e1 100644
    --- a/sound/core/seq/oss/seq_oss_init.c
    +++ b/sound/core/seq/oss/seq_oss_init.c
    @@ -403,14 +403,11 @@ free_devinfo(void *private)
    {
    struct seq_oss_devinfo *dp = (struct seq_oss_devinfo *)private;

    - if (dp->timer)
    - snd_seq_oss_timer_delete(dp->timer);
    + snd_seq_oss_timer_delete(dp->timer);

    - if (dp->writeq)
    - snd_seq_oss_writeq_delete(dp->writeq);
    + snd_seq_oss_writeq_delete(dp->writeq);

    - if (dp->readq)
    - snd_seq_oss_readq_delete(dp->readq);
    + snd_seq_oss_readq_delete(dp->readq);

    kfree(dp);
    }
    diff --git a/sound/core/sgbuf.c b/sound/core/sgbuf.c
    index 0a41850..84fffab 100644
    --- a/sound/core/sgbuf.c
    +++ b/sound/core/sgbuf.c
    @@ -39,8 +39,7 @@ int snd_free_sgbuf_pages(struct snd_dma_buffer *dmab)
    if (! sgbuf)
    return -EINVAL;

    - if (dmab->area)
    - vunmap(dmab->area);
    + vunmap(dmab->area);
    dmab->area = NULL;

    tmpb.dev.type = SNDRV_DMA_TYPE_DEV;
    --
    2.1.3


    \
     
     \ /
      Last update: 2014-11-21 19:21    [W:4.019 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site