ASoC: SOF: loader: Remove the query_fw_configuration ops

The query_fw_configuration callback is redundant and the only user of it
was converted to use the generic post_fw_boot ops.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Chao Song <chao.song@intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20221020121238.18339-19-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/loader.c b/sound/soc/sof/loader.c
index a1c4a51636c972b315500f7545a5895482828187..81d202e5ce53de3eec2943ee7bd453452b6f27c6 100644 (file)
--- a/sound/soc/sof/loader.c
+++ b/sound/soc/sof/loader.c
@@ -174,14 +174,8 @@ int snd_sof_run_firmware(struct snd_sof_dev *sdev)
                return ret;
        }
 
-       if (sdev->ipc->ops->post_fw_boot) {
-               ret = sdev->ipc->ops->post_fw_boot(sdev);
-               if (ret)
-                       return ret;
-       }
-
-       if (sdev->first_boot && sdev->ipc->ops->fw_loader->query_fw_configuration)
-               return sdev->ipc->ops->fw_loader->query_fw_configuration(sdev);
+       if (sdev->ipc->ops->post_fw_boot)
+               return sdev->ipc->ops->post_fw_boot(sdev);
 
        return 0;
 }

diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h
index c7ab78b042aa20320abd3d0c5e072a27a463fc54..403e81220244a46711bc0efb8f306dde51f2f753 100644 (file)
--- a/sound/soc/sof/sof-priv.h
+++ b/sound/soc/sof/sof-priv.h
@@ -421,15 +421,11 @@ struct sof_ipc_pm_ops {
  *                     DSP.
  *                     The function implements generic, hardware independent way
  *                     of loading the initial firmware and its modules (if any).
- * @query_fw_configuration: Optional function pointer to query information and
- *                     configuration from the booted firmware.
- *                     Executed after the first successful firmware boot.
  */
 struct sof_ipc_fw_loader_ops {
        int (*validate)(struct snd_sof_dev *sdev);
        size_t (*parse_ext_manifest)(struct snd_sof_dev *sdev);
        int (*load_fw_to_dsp)(struct snd_sof_dev *sdev);
-       int (*query_fw_configuration)(struct snd_sof_dev *sdev);
 };
 
 struct sof_ipc_tplg_ops;