lkml.org 
[lkml]   [2014]   [Nov]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 1/1] ALSA: sb: Deletion of unnecessary checks before two function calls
    At Fri, 21 Nov 2014 19:35:18 +0100,
    SF Markus Elfring wrote:
    >
    > From: Markus Elfring <elfring@users.sourceforge.net>
    > Date: Fri, 21 Nov 2014 19:32:02 +0100
    >
    > The functions release_and_free_resource() and snd_util_memhdr_free() test
    > whether their argument is NULL and then return immediately.
    > 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>

    Applied, thanks.


    Takashi

    > ---
    > sound/isa/sb/emu8000_synth.c | 3 +--
    > sound/isa/sb/sb_common.c | 3 +--
    > 2 files changed, 2 insertions(+), 4 deletions(-)
    >
    > diff --git a/sound/isa/sb/emu8000_synth.c b/sound/isa/sb/emu8000_synth.c
    > index 4e3fcfb..95b39be 100644
    > --- a/sound/isa/sb/emu8000_synth.c
    > +++ b/sound/isa/sb/emu8000_synth.c
    > @@ -105,8 +105,7 @@ static int snd_emu8000_delete_device(struct snd_seq_device *dev)
    > snd_device_free(dev->card, hw->pcm);
    > if (hw->emu)
    > snd_emux_free(hw->emu);
    > - if (hw->memhdr)
    > - snd_util_memhdr_free(hw->memhdr);
    > + snd_util_memhdr_free(hw->memhdr);
    > hw->emu = NULL;
    > hw->memhdr = NULL;
    > return 0;
    > diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c
    > index 3ef9906..f22b448 100644
    > --- a/sound/isa/sb/sb_common.c
    > +++ b/sound/isa/sb/sb_common.c
    > @@ -184,8 +184,7 @@ static int snd_sbdsp_probe(struct snd_sb * chip)
    >
    > static int snd_sbdsp_free(struct snd_sb *chip)
    > {
    > - if (chip->res_port)
    > - release_and_free_resource(chip->res_port);
    > + release_and_free_resource(chip->res_port);
    > if (chip->irq >= 0)
    > free_irq(chip->irq, (void *) chip);
    > #ifdef CONFIG_ISA
    > --
    > 2.1.3
    >


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