Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 245c539a authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-component: add snd_soc_component_hw_params() 



Current ALSA SoC is directly using component->driver->ops->xxx,
thus, it is deep nested, and makes code difficult to read,
and is not good for encapsulation.
This patch adds new snd_soc_component_hw_params() and use it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87blxh5rnf.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6d537233

include/sound/soc-component.h

+3 −0
Original line number Diff line number Diff line
@@ -345,5 +345,8 @@ int snd_soc_component_close(struct snd_soc_component *component, 
			    struct snd_pcm_substream *substream);

int snd_soc_component_prepare(struct snd_soc_component *component,

			      struct snd_pcm_substream *substream);

int snd_soc_component_hw_params(struct snd_soc_component *component,

				struct snd_pcm_substream *substream,

				struct snd_pcm_hw_params *params);



#endif /* __SOC_COMPONENT_H */

sound/soc/soc-component.c

+11 −0
Original line number Diff line number Diff line
@@ -315,3 +315,14 @@ int snd_soc_component_prepare(struct snd_soc_component *component, 


	return 0;

}



int snd_soc_component_hw_params(struct snd_soc_component *component,

				struct snd_pcm_substream *substream,

				struct snd_pcm_hw_params *params)

{

	if (component->driver->ops &&

	    component->driver->ops->hw_params)

		return component->driver->ops->hw_params(substream, params);



	return 0;

}

sound/soc/soc-pcm.c

+1 −5
Original line number Diff line number Diff line
@@ -951,11 +951,7 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, 
	for_each_rtdcom(rtd, rtdcom) {

		component = rtdcom->component;



		if (!component->driver->ops ||

		    !component->driver->ops->hw_params)

			continue;



		ret = component->driver->ops->hw_params(substream, params);

		ret = snd_soc_component_hw_params(component, substream, params);

		if (ret < 0) {

			dev_err(component->dev,

				"ASoC: %s hw params failed: %d\n",