From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752216AbaKQMpk (ORCPT ); Mon, 17 Nov 2014 07:45:40 -0500 Received: from cantor2.suse.de ([195.135.220.15]:54578 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752116AbaKQMpi (ORCPT ); Mon, 17 Nov 2014 07:45:38 -0500 Date: Mon, 17 Nov 2014 13:45:36 +0100 Message-ID: From: Takashi Iwai To: SF Markus Elfring Cc: Jaroslav Kysela , alsa-devel@alsa-project.org, LKML , kernel-janitors@vger.kernel.org, Coccinelle Subject: Re: [PATCH 1/1] ALSA: hda: Deletion of unnecessary checks before two function calls In-Reply-To: <5469C8C8.8010306@users.sourceforge.net> References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> <5469C8C8.8010306@users.sourceforge.net> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.4 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Mon, 17 Nov 2014 11:07:04 +0100, SF Markus Elfring wrote: > > From: Markus Elfring > Date: Mon, 17 Nov 2014 10:44:33 +0100 > > The functions kfree() and release_firmware() 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 Applied, thanks. Takashi > --- > sound/pci/hda/hda_codec.c | 3 +-- > sound/pci/hda/hda_intel.c | 3 +-- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c > index ec6a7d0..3fe8859 100644 > --- a/sound/pci/hda/hda_codec.c > +++ b/sound/pci/hda/hda_codec.c > @@ -827,8 +827,7 @@ static void snd_hda_bus_free(struct hda_bus *bus) > WARN_ON(!list_empty(&bus->codec_list)); > if (bus->workq) > flush_workqueue(bus->workq); > - if (bus->unsol) > - kfree(bus->unsol); > + kfree(bus->unsol); > if (bus->ops.private_free) > bus->ops.private_free(bus); > if (bus->workq) > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c > index 0a7f848..b4ec4e1 100644 > --- a/sound/pci/hda/hda_intel.c > +++ b/sound/pci/hda/hda_intel.c > @@ -1129,8 +1129,7 @@ static int azx_free(struct azx *chip) > pci_disable_device(chip->pci); > kfree(chip->azx_dev); > #ifdef CONFIG_SND_HDA_PATCH_LOADER > - if (chip->fw) > - release_firmware(chip->fw); > + release_firmware(chip->fw); > #endif > if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) { > hda_display_power(false); > -- > 2.1.3 > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Date: Mon, 17 Nov 2014 12:45:36 +0000 Subject: Re: [PATCH 1/1] ALSA: hda: Deletion of unnecessary checks before two function calls Message-Id: List-Id: References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> <5469C8C8.8010306@users.sourceforge.net> In-Reply-To: <5469C8C8.8010306@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: SF Markus Elfring Cc: Jaroslav Kysela , alsa-devel@alsa-project.org, LKML , kernel-janitors@vger.kernel.org, Coccinelle At Mon, 17 Nov 2014 11:07:04 +0100, SF Markus Elfring wrote: > > From: Markus Elfring > Date: Mon, 17 Nov 2014 10:44:33 +0100 > > The functions kfree() and release_firmware() 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 Applied, thanks. Takashi > --- > sound/pci/hda/hda_codec.c | 3 +-- > sound/pci/hda/hda_intel.c | 3 +-- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c > index ec6a7d0..3fe8859 100644 > --- a/sound/pci/hda/hda_codec.c > +++ b/sound/pci/hda/hda_codec.c > @@ -827,8 +827,7 @@ static void snd_hda_bus_free(struct hda_bus *bus) > WARN_ON(!list_empty(&bus->codec_list)); > if (bus->workq) > flush_workqueue(bus->workq); > - if (bus->unsol) > - kfree(bus->unsol); > + kfree(bus->unsol); > if (bus->ops.private_free) > bus->ops.private_free(bus); > if (bus->workq) > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c > index 0a7f848..b4ec4e1 100644 > --- a/sound/pci/hda/hda_intel.c > +++ b/sound/pci/hda/hda_intel.c > @@ -1129,8 +1129,7 @@ static int azx_free(struct azx *chip) > pci_disable_device(chip->pci); > kfree(chip->azx_dev); > #ifdef CONFIG_SND_HDA_PATCH_LOADER > - if (chip->fw) > - release_firmware(chip->fw); > + release_firmware(chip->fw); > #endif > if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) { > hda_display_power(false); > -- > 2.1.3 > >