Unverified Commit ba42b8ba authored Oct 20, 2022 by Peter Ujfalusi Committed by Mark Brown Oct 21, 2022

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>

parent e6851310

sound/soc/sof/loader.c

+2 −8

Original line number	Original line	Diff line number	Diff line
	@@ -174,14 +174,8 @@ int snd_sof_run_firmware(struct snd_sof_dev *sdev)
	return ret;		return ret;
	}		}

	if (sdev->ipc->ops->post_fw_boot) {		if (sdev->ipc->ops->post_fw_boot)
	ret = sdev->ipc->ops->post_fw_boot(sdev);		return 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);

	return 0;		return 0;
	}		}

sound/soc/sof/sof-priv.h

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -421,15 +421,11 @@ struct sof_ipc_pm_ops {
	* DSP.		* DSP.
	* The function implements generic, hardware independent way		* The function implements generic, hardware independent way
	* of loading the initial firmware and its modules (if any).		* 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 {		struct sof_ipc_fw_loader_ops {
	int (validate)(struct snd_sof_dev sdev);		int (validate)(struct snd_sof_dev sdev);
	size_t (parse_ext_manifest)(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 (load_fw_to_dsp)(struct snd_sof_dev sdev);
	int (query_fw_configuration)(struct snd_sof_dev sdev);
	};		};

	struct sof_ipc_tplg_ops;		struct sof_ipc_tplg_ops;