ASoC: SOF: remove unused state variable in suspend function

Remove unused and no plan to use variable from suspend function.

Signed-off-by: Fred Oh <fred.oh@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20190722141402.7194-10-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda-dsp.c b/sound/soc/sof/intel/hda-dsp.c
index 91de4785b6a3ec3e37b801fdcebc4bd6618b60f8..4315896b3f07cfc23786f549f2a4f1efd753c13f 100644 (file)
--- a/sound/soc/sof/intel/hda-dsp.c
+++ b/sound/soc/sof/intel/hda-dsp.c
@@ -282,7 +282,7 @@ void hda_dsp_ipc_int_disable(struct snd_sof_dev *sdev)
                        HDA_DSP_REG_HIPCCTL_BUSY | HDA_DSP_REG_HIPCCTL_DONE, 0);
 }
 
-static int hda_suspend(struct snd_sof_dev *sdev, int state)
+static int hda_suspend(struct snd_sof_dev *sdev, bool runtime_suspend)
 {
        struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;
        const struct sof_intel_dsp_desc *chip = hda->desc;
@@ -431,19 +431,19 @@ int hda_dsp_runtime_idle(struct snd_sof_dev *sdev)
        return 0;
 }
 
-int hda_dsp_runtime_suspend(struct snd_sof_dev *sdev, int state)
+int hda_dsp_runtime_suspend(struct snd_sof_dev *sdev)
 {
        /* stop hda controller and power dsp off */
-       return hda_suspend(sdev, state);
+       return hda_suspend(sdev, true);
 }
 
-int hda_dsp_suspend(struct snd_sof_dev *sdev, int state)
+int hda_dsp_suspend(struct snd_sof_dev *sdev)
 {
        struct hdac_bus *bus = sof_to_bus(sdev);
        int ret;
 
        /* stop hda controller and power dsp off */
-       ret = hda_suspend(sdev, state);
+       ret = hda_suspend(sdev, false);
        if (ret < 0) {
                dev_err(bus->dev, "error: suspending dsp\n");
                return ret;

diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h
index d9c17146200b36e094900ae0d538e668ad9ed622..84d5fd021ccbdf16d857dccbc5cf174749dadc2e 100644 (file)
--- a/sound/soc/sof/intel/hda.h
+++ b/sound/soc/sof/intel/hda.h
@@ -453,9 +453,9 @@ int hda_dsp_core_reset_power_down(struct snd_sof_dev *sdev,
 void hda_dsp_ipc_int_enable(struct snd_sof_dev *sdev);
 void hda_dsp_ipc_int_disable(struct snd_sof_dev *sdev);
 
-int hda_dsp_suspend(struct snd_sof_dev *sdev, int state);
+int hda_dsp_suspend(struct snd_sof_dev *sdev);
 int hda_dsp_resume(struct snd_sof_dev *sdev);
-int hda_dsp_runtime_suspend(struct snd_sof_dev *sdev, int state);
+int hda_dsp_runtime_suspend(struct snd_sof_dev *sdev);
 int hda_dsp_runtime_resume(struct snd_sof_dev *sdev);
 int hda_dsp_runtime_idle(struct snd_sof_dev *sdev);
 int hda_dsp_set_hw_params_upon_resume(struct snd_sof_dev *sdev);

diff --git a/sound/soc/sof/ops.h b/sound/soc/sof/ops.h
index 8fda42748f3930e5f47e7cb82b912d539dc024fc..793c1aea0c53b30e4f6f2ee23be456c6f75a963a 100644 (file)
--- a/sound/soc/sof/ops.h
+++ b/sound/soc/sof/ops.h
@@ -128,10 +128,10 @@ static inline int snd_sof_dsp_resume(struct snd_sof_dev *sdev)
        return 0;
 }
 
-static inline int snd_sof_dsp_suspend(struct snd_sof_dev *sdev, int state)
+static inline int snd_sof_dsp_suspend(struct snd_sof_dev *sdev)
 {
        if (sof_ops(sdev)->suspend)
-               return sof_ops(sdev)->suspend(sdev, state);
+               return sof_ops(sdev)->suspend(sdev);
 
        return 0;
 }
@@ -144,11 +144,10 @@ static inline int snd_sof_dsp_runtime_resume(struct snd_sof_dev *sdev)
        return 0;
 }
 
-static inline int snd_sof_dsp_runtime_suspend(struct snd_sof_dev *sdev,
-                                             int state)
+static inline int snd_sof_dsp_runtime_suspend(struct snd_sof_dev *sdev)
 {
        if (sof_ops(sdev)->runtime_suspend)
-               return sof_ops(sdev)->runtime_suspend(sdev, state);
+               return sof_ops(sdev)->runtime_suspend(sdev);
 
        return 0;
 }

diff --git a/sound/soc/sof/pm.c b/sound/soc/sof/pm.c
index 48c6d78d72e2e84468680e57580c3827bc046b40..e23beaeefe0054a69b27ae97866d1ace4a04a351 100644 (file)
--- a/sound/soc/sof/pm.c
+++ b/sound/soc/sof/pm.c
@@ -377,9 +377,9 @@ static int sof_suspend(struct device *dev, bool runtime_suspend)
 
        /* power down all DSP cores */
        if (runtime_suspend)
-               ret = snd_sof_dsp_runtime_suspend(sdev, 0);
+               ret = snd_sof_dsp_runtime_suspend(sdev);
        else
-               ret = snd_sof_dsp_suspend(sdev, 0);
+               ret = snd_sof_dsp_suspend(sdev);
        if (ret < 0)
                dev_err(sdev->dev,
                        "error: failed to power down DSP during suspend %d\n",

diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h
index a6ec9115a9fb275cea4c91bb88bb4c219b25269c..b8c9274ccf4287de9f4f8acaac9c29d10415c32e 100644 (file)
--- a/sound/soc/sof/sof-priv.h
+++ b/sound/soc/sof/sof-priv.h
@@ -171,10 +171,9 @@ struct snd_sof_dsp_ops {
        int (*post_fw_run)(struct snd_sof_dev *sof_dev); /* optional */
 
        /* DSP PM */
-       int (*suspend)(struct snd_sof_dev *sof_dev, int state); /* optional */
+       int (*suspend)(struct snd_sof_dev *sof_dev); /* optional */
        int (*resume)(struct snd_sof_dev *sof_dev); /* optional */
-       int (*runtime_suspend)(struct snd_sof_dev *sof_dev,
-                              int state); /* optional */
+       int (*runtime_suspend)(struct snd_sof_dev *sof_dev); /* optional */
        int (*runtime_resume)(struct snd_sof_dev *sof_dev); /* optional */
        int (*runtime_idle)(struct snd_sof_dev *sof_dev); /* optional */
        int (*set_hw_params_upon_resume)(struct snd_sof_dev *sdev); /* optional */