diff options
author | Markus Elfring <elfring@users.sourceforge.net> | 2014-11-17 05:28:02 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-11-17 07:45:51 -0500 |
commit | ae1b22658e6d3ebc6af07a225c221d84fe8cb91f (patch) | |
tree | d4c5f8d00cb8ca39717a4c7152fc1e4a8bc33c12 /sound/pci/ice1712 | |
parent | f0acd28c87ad2a5d1b40403fdd5defda2961b2a1 (diff) |
ALSA: ice17xx: Deletion of unnecessary checks before the function call "snd_ac97_resume"
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@users.sourceforge.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ice1712')
-rw-r--r-- | sound/pci/ice1712/ice1712.c | 3 | ||||
-rw-r--r-- | 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 65251911cf6f..b039b46152c6 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
@@ -2878,8 +2878,7 @@ static int snd_ice1712_resume(struct device *dev) | |||
2878 | outw(ice->pm_saved_spdif_ctrl, ICEMT(ice, ROUTE_SPDOUT)); | 2878 | outw(ice->pm_saved_spdif_ctrl, ICEMT(ice, ROUTE_SPDOUT)); |
2879 | outw(ice->pm_saved_route, ICEMT(ice, ROUTE_PSDOUT03)); | 2879 | outw(ice->pm_saved_route, ICEMT(ice, ROUTE_PSDOUT03)); |
2880 | 2880 | ||
2881 | if (ice->ac97) | 2881 | snd_ac97_resume(ice->ac97); |
2882 | snd_ac97_resume(ice->ac97); | ||
2883 | 2882 | ||
2884 | snd_power_change_state(card, SNDRV_CTL_POWER_D0); | 2883 | snd_power_change_state(card, SNDRV_CTL_POWER_D0); |
2885 | return 0; | 2884 | return 0; |
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index ea53167081b8..d73da157ea14 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c | |||
@@ -2875,8 +2875,7 @@ static int snd_vt1724_resume(struct device *dev) | |||
2875 | outb(ice->pm_saved_spdif_cfg, ICEREG1724(ice, SPDIF_CFG)); | 2875 | outb(ice->pm_saved_spdif_cfg, ICEREG1724(ice, SPDIF_CFG)); |
2876 | outl(ice->pm_saved_route, ICEMT1724(ice, ROUTE_PLAYBACK)); | 2876 | outl(ice->pm_saved_route, ICEMT1724(ice, ROUTE_PLAYBACK)); |
2877 | 2877 | ||
2878 | if (ice->ac97) | 2878 | snd_ac97_resume(ice->ac97); |
2879 | snd_ac97_resume(ice->ac97); | ||
2880 | 2879 | ||
2881 | snd_power_change_state(card, SNDRV_CTL_POWER_D0); | 2880 | snd_power_change_state(card, SNDRV_CTL_POWER_D0); |
2882 | return 0; | 2881 | return 0; |