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

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

ASoC: soc-component: add snd_soc_component_hw_free() 



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

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


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

include/sound/soc-component.h

+2 −0
Original line number Diff line number Diff line
@@ -348,5 +348,7 @@ int snd_soc_component_prepare(struct snd_soc_component *component, 
int snd_soc_component_hw_params(struct snd_soc_component *component,

				struct snd_pcm_substream *substream,

				struct snd_pcm_hw_params *params);

int snd_soc_component_hw_free(struct snd_soc_component *component,

			      struct snd_pcm_substream *substream);



#endif /* __SOC_COMPONENT_H */

sound/soc/soc-component.c

+10 −0
Original line number Diff line number Diff line
@@ -326,3 +326,13 @@ int snd_soc_component_hw_params(struct snd_soc_component *component, 


	return 0;

}



int snd_soc_component_hw_free(struct snd_soc_component *component,

			       struct snd_pcm_substream *substream)

{

	if (component->driver->ops &&

	    component->driver->ops->hw_free)

		return component->driver->ops->hw_free(substream);



	return 0;

}

sound/soc/soc-pcm.c

+3 −6
Original line number Diff line number Diff line
@@ -847,6 +847,7 @@ static int soc_pcm_components_hw_free(struct snd_pcm_substream *substream, 
	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_rtdcom_list *rtdcom;

	struct snd_soc_component *component;

	int ret = 0;



	for_each_rtdcom(rtd, rtdcom) {

		component = rtdcom->component;
@@ -854,14 +855,10 @@ static int soc_pcm_components_hw_free(struct snd_pcm_substream *substream, 
		if (component == last)

			break;



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

		    !component->driver->ops->hw_free)

			continue;



		component->driver->ops->hw_free(substream);

		ret |= snd_soc_component_hw_free(component, substream);

	}



	return 0;

	return ret;

}



/*