aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2014-11-17 04:44:33 -0500
committerTakashi Iwai <tiwai@suse.de>2014-11-17 07:45:23 -0500
commitf0acd28c87ad2a5d1b40403fdd5defda2961b2a1 (patch)
tree1ccd31d0a0a5fb4173b4953c966239897bc1c0c2 /sound/pci/hda
parentb8eca77e54525c818f35f51afb64fc13205443a3 (diff)
ALSA: hda: Deletion of unnecessary checks before two function calls
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@users.sourceforge.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda')
-rw-r--r--sound/pci/hda/hda_codec.c3
-rw-r--r--sound/pci/hda/hda_intel.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index ca98f5209f8f..b2d58998dbdd 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -834,8 +834,7 @@ static void snd_hda_bus_free(struct hda_bus *bus)
834 WARN_ON(!list_empty(&bus->codec_list)); 834 WARN_ON(!list_empty(&bus->codec_list));
835 if (bus->workq) 835 if (bus->workq)
836 flush_workqueue(bus->workq); 836 flush_workqueue(bus->workq);
837 if (bus->unsol) 837 kfree(bus->unsol);
838 kfree(bus->unsol);
839 if (bus->ops.private_free) 838 if (bus->ops.private_free)
840 bus->ops.private_free(bus); 839 bus->ops.private_free(bus);
841 if (bus->workq) 840 if (bus->workq)
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 9ab1e631cb32..91fa959d05fe 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1130,8 +1130,7 @@ static int azx_free(struct azx *chip)
1130 pci_disable_device(chip->pci); 1130 pci_disable_device(chip->pci);
1131 kfree(chip->azx_dev); 1131 kfree(chip->azx_dev);
1132#ifdef CONFIG_SND_HDA_PATCH_LOADER 1132#ifdef CONFIG_SND_HDA_PATCH_LOADER
1133 if (chip->fw) 1133 release_firmware(chip->fw);
1134 release_firmware(chip->fw);
1135#endif 1134#endif
1136 if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) { 1135 if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
1137 hda_display_power(false); 1136 hda_display_power(false);