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

Unverified Commit 5693d50c authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-component: add snd_soc_component_trigger() 



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_trigger() and use it.

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


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

include/sound/soc-component.h

+3 −0
Original line number Diff line number Diff line
@@ -350,5 +350,8 @@ int snd_soc_component_hw_params(struct snd_soc_component *component, 
				struct snd_pcm_hw_params *params);

int snd_soc_component_hw_free(struct snd_soc_component *component,

			      struct snd_pcm_substream *substream);

int snd_soc_component_trigger(struct snd_soc_component *component,

			      struct snd_pcm_substream *substream,

			      int cmd);



#endif /* __SOC_COMPONENT_H */

sound/soc/soc-component.c

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


	return 0;

}



int snd_soc_component_trigger(struct snd_soc_component *component,

			      struct snd_pcm_substream *substream,

			      int cmd)

{

	if (component->driver->ops &&

	    component->driver->ops->trigger)

		return component->driver->ops->trigger(substream, cmd);



	return 0;

}

sound/soc/soc-pcm.c

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

		component = rtdcom->component;



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

		    !component->driver->ops->trigger)

			continue;



		ret = component->driver->ops->trigger(substream, cmd);

		ret = snd_soc_component_trigger(component, substream, cmd);

		if (ret < 0)

			return ret;

	}