[alsa-devel] [PATCH 1/1] ALSA: hda: Deletion of unnecessary checks before two function calls

[Takashi Iwai]

At Mon, 17 Nov 2014 11:07:04 +0100,
SF Markus Elfring wrote:
> 
> From: Markus Elfring <elfring at users.sourceforge.net>
> 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 <elfring at users.sourceforge.net>

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
> 
>