ALSA: hda: Deletion of unnecessary checks before two function calls
authorMarkus Elfring <elfring@users.sourceforge.net>
Mon, 17 Nov 2014 09:44:33 +0000 (10:44 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 17 Nov 2014 12:45:23 +0000 (13:45 +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@users.sourceforge.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_intel.c

index ca98f5209f8fbe2123380c324c9a8ad8b6caf332..b2d58998dbddbb6c99e0b93c2a9b390565c8f0a6 100644 (file)
@@ -834,8 +834,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)
index 9ab1e631cb32244262d9a0cfe5009adfe4677aca..91fa959d05fe9ea4befe707b6d9e6fb733b69532 100644 (file)
@@ -1130,8 +1130,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);