ASoC: SOF: remove unneeded variables

Remove unneeded temporary local variables and their declarations.
Change suggested by coccinelle.

Signed-off-by: Payal Kshirsagar <payalskshirsagar1234@gmail.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20200409184853.15896-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c
index 3041fbbb010a2269e2106a45e0f77ab35c66918b..7e7e296a39539928f6f4f25af822ad7d4484be8d 100644 (file)
--- a/sound/soc/sof/intel/hda-codec.c
+++ b/sound/soc/sof/intel/hda-codec.c
@@ -207,7 +207,6 @@ EXPORT_SYMBOL_NS(hda_codec_i915_init, SND_SOC_SOF_HDA_AUDIO_CODEC_I915);
 int hda_codec_i915_exit(struct snd_sof_dev *sdev)
 {
        struct hdac_bus *bus = sof_to_bus(sdev);
-       int ret;
 
        if (!bus->audio_component)
                return 0;
@@ -215,9 +214,7 @@ int hda_codec_i915_exit(struct snd_sof_dev *sdev)
        /* power down unconditionally */
        snd_hdac_display_power(bus, HDA_CODEC_IDX_CONTROLLER, false);
 
-       ret = snd_hdac_i915_exit(bus);
-
-       return ret;
+       return snd_hdac_i915_exit(bus);
 }
 EXPORT_SYMBOL_NS(hda_codec_i915_exit, SND_SOC_SOF_HDA_AUDIO_CODEC_I915);
 

diff --git a/sound/soc/sof/nocodec.c b/sound/soc/sof/nocodec.c
index 2233146386ccf4cd23a1a5ab20a2e0f0f2539c8a..5bf67b2aa4e7f84a1f770fc301e070167a9cc60b 100644 (file)
--- a/sound/soc/sof/nocodec.c
+++ b/sound/soc/sof/nocodec.c
@@ -66,7 +66,6 @@ int sof_nocodec_setup(struct device *dev,
                      const struct snd_sof_dsp_ops *ops)
 {
        struct snd_soc_dai_link *links;
-       int ret;
 
        /* create dummy BE dai_links */
        links = devm_kzalloc(dev, sizeof(struct snd_soc_dai_link) *
@@ -74,9 +73,8 @@ int sof_nocodec_setup(struct device *dev,
        if (!links)
                return -ENOMEM;
 
-       ret = sof_nocodec_bes_setup(dev, ops, links, ops->num_drv,
-                                   &sof_nocodec_card);
-       return ret;
+       return sof_nocodec_bes_setup(dev, ops, links, ops->num_drv,
+                                    &sof_nocodec_card);
 }
 EXPORT_SYMBOL(sof_nocodec_setup);