[alsa-devel] [PATCH 1/1] ALSA: ice17xx: Deletion of unnecessary checks before the function call "snd_ac97_resume"

[Takashi Iwai]

At Mon, 17 Nov 2014 11:34:22 +0100,
SF Markus Elfring wrote:
> 
> From: Markus Elfring <elfring at users.sourceforge.net>
> Date: Mon, 17 Nov 2014 11:28:02 +0100
> 
> The snd_ac97_resume() function tests whether its argument is NULL and then
> returns 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/ice1712/ice1712.c | 3 +--
>  sound/pci/ice1712/ice1724.c | 3 +--
>  2 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
> index 87f7fc4..e1e18b5 100644
> --- a/sound/pci/ice1712/ice1712.c
> +++ b/sound/pci/ice1712/ice1712.c
> @@ -2905,8 +2905,7 @@ static int snd_ice1712_resume(struct device *dev)
>  	outw(ice->pm_saved_spdif_ctrl, ICEMT(ice, ROUTE_SPDOUT));
>  	outw(ice->pm_saved_route, ICEMT(ice, ROUTE_PSDOUT03));
>  
> -	if (ice->ac97)
> -		snd_ac97_resume(ice->ac97);
> +	snd_ac97_resume(ice->ac97);
>  
>  	snd_power_change_state(card, SNDRV_CTL_POWER_D0);
>  	return 0;
> diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
> index 08cb08a..0e56835 100644
> --- a/sound/pci/ice1712/ice1724.c
> +++ b/sound/pci/ice1712/ice1724.c
> @@ -2884,8 +2884,7 @@ static int snd_vt1724_resume(struct device *dev)
>  	outb(ice->pm_saved_spdif_cfg, ICEREG1724(ice, SPDIF_CFG));
>  	outl(ice->pm_saved_route, ICEMT1724(ice, ROUTE_PLAYBACK));
>  
> -	if (ice->ac97)
> -		snd_ac97_resume(ice->ac97);
> +	snd_ac97_resume(ice->ac97);
>  
>  	snd_power_change_state(card, SNDRV_CTL_POWER_D0);
>  	return 0;
> -- 
> 2.1.3
> 
>