ASoC: SOF: Intel: hda: always do a full reset

There's no point in checking for a full-reset condition that is
always-true in the callers.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20221024165310.246183-11-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda-ctrl.c b/sound/soc/sof/intel/hda-ctrl.c
index 7f387ad5ef6f4bcd55b1527ffa2533aa6c157bf4..e3334693c29263eb50f7ae35ec4931ec0b8f18a0 100644 (file)
--- a/sound/soc/sof/intel/hda-ctrl.c
+++ b/sound/soc/sof/intel/hda-ctrl.c
@@ -182,7 +182,7 @@ int hda_dsp_ctrl_clock_power_gating(struct snd_sof_dev *sdev, bool enable)
        return 0;
 }
 
-int hda_dsp_ctrl_init_chip(struct snd_sof_dev *sdev, bool full_reset)
+int hda_dsp_ctrl_init_chip(struct snd_sof_dev *sdev)
 {
        struct hdac_bus *bus = sof_to_bus(sdev);
 #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
@@ -199,20 +199,18 @@ int hda_dsp_ctrl_init_chip(struct snd_sof_dev *sdev, bool full_reset)
 #endif
        hda_dsp_ctrl_misc_clock_gating(sdev, false);
 
-       if (full_reset) {
-               /* reset HDA controller */
-               ret = hda_dsp_ctrl_link_reset(sdev, true);
-               if (ret < 0) {
-                       dev_err(sdev->dev, "error: failed to reset HDA controller\n");
-                       goto err;
-               }
+       /* reset HDA controller */
+       ret = hda_dsp_ctrl_link_reset(sdev, true);
+       if (ret < 0) {
+               dev_err(sdev->dev, "error: failed to reset HDA controller\n");
+               goto err;
+       }
 
-               /* exit HDA controller reset */
-               ret = hda_dsp_ctrl_link_reset(sdev, false);
-               if (ret < 0) {
-                       dev_err(sdev->dev, "error: failed to exit HDA controller reset\n");
-                       goto err;
-               }
+       /* exit HDA controller reset */
+       ret = hda_dsp_ctrl_link_reset(sdev, false);
+       if (ret < 0) {
+               dev_err(sdev->dev, "error: failed to exit HDA controller reset\n");
+               goto err;
        }
 
 #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

diff --git a/sound/soc/sof/intel/hda-dsp.c b/sound/soc/sof/intel/hda-dsp.c
index 74067df96fdc4c54fe2d9cf46c9f5c6bc220d2f5..6d896ea3168063b153f72bb34325f5e614be27fe 100644 (file)
--- a/sound/soc/sof/intel/hda-dsp.c
+++ b/sound/soc/sof/intel/hda-dsp.c
@@ -691,7 +691,7 @@ static int hda_resume(struct snd_sof_dev *sdev, bool runtime_resume)
        snd_sof_pci_update_bits(sdev, PCI_TCSEL, 0x07, 0);
 
        /* reset and start hda controller */
-       ret = hda_dsp_ctrl_init_chip(sdev, true);
+       ret = hda_dsp_ctrl_init_chip(sdev);
        if (ret < 0) {
                dev_err(sdev->dev,
                        "error: failed to start controller after resume\n");

diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
index d63f843dc7aab38966cf1028374538bd64d67b9b..2ee414600f77981e776591e23a72977759470417 100644 (file)
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -890,7 +890,7 @@ static int hda_init_caps(struct snd_sof_dev *sdev)
                dev_dbg(sdev->dev, "PP capability, will probe DSP later.\n");
 
        /* Init HDA controller after i915 init */
-       ret = hda_dsp_ctrl_init_chip(sdev, true);
+       ret = hda_dsp_ctrl_init_chip(sdev);
        if (ret < 0) {
                dev_err(bus->dev, "error: init chip failed with ret: %d\n",
                        ret);

diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h
index c91fc36378235f6d0ee84247c64a7ac0ffb0735b..6b1474d78ebb3053500846d1d2d743285d41d1ba 100644 (file)
--- a/sound/soc/sof/intel/hda.h
+++ b/sound/soc/sof/intel/hda.h
@@ -702,7 +702,7 @@ void hda_dsp_ctrl_ppcap_int_enable(struct snd_sof_dev *sdev, bool enable);
 int hda_dsp_ctrl_link_reset(struct snd_sof_dev *sdev, bool reset);
 void hda_dsp_ctrl_misc_clock_gating(struct snd_sof_dev *sdev, bool enable);
 int hda_dsp_ctrl_clock_power_gating(struct snd_sof_dev *sdev, bool enable);
-int hda_dsp_ctrl_init_chip(struct snd_sof_dev *sdev, bool full_reset);
+int hda_dsp_ctrl_init_chip(struct snd_sof_dev *sdev);
 void hda_dsp_ctrl_stop_chip(struct snd_sof_dev *sdev);
 /*
  * HDA bus operations.