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

ASoC: remove unneeded .pcm_new/free 



commit ef050bec ("ASoC: Remove platform code now everything is
componentised") removed platform code, but it didn't remove
.pcm_new/free which existed only for platform.
This patch remove these

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2250e76d

include/sound/soc.h

+0 −2
Original line number Diff line number Diff line
@@ -886,8 +886,6 @@ struct snd_soc_component { 
	void (*remove)(struct snd_soc_component *);

	int (*suspend)(struct snd_soc_component *);

	int (*resume)(struct snd_soc_component *);

	int (*pcm_new)(struct snd_soc_component *, struct snd_soc_pcm_runtime *);

	void (*pcm_free)(struct snd_soc_component *, struct snd_pcm *);



	int (*set_sysclk)(struct snd_soc_component *component,

			  int clk_id, int source, unsigned int freq, int dir);

sound/soc/soc-core.c

+0 −18
Original line number Diff line number Diff line
@@ -2943,22 +2943,6 @@ static int snd_soc_component_stream_event(struct snd_soc_dapm_context *dapm, 
	return component->driver->stream_event(component, event);

}



static int snd_soc_component_drv_pcm_new(struct snd_soc_component *component,

					struct snd_soc_pcm_runtime *rtd)

{

	if (component->driver->pcm_new)

		return component->driver->pcm_new(rtd);



	return 0;

}



static void snd_soc_component_drv_pcm_free(struct snd_soc_component *component,

					  struct snd_pcm *pcm)

{

	if (component->driver->pcm_free)

		component->driver->pcm_free(pcm);

}



static int snd_soc_component_set_bias_level(struct snd_soc_dapm_context *dapm,

					enum snd_soc_bias_level level)

{
@@ -2987,8 +2971,6 @@ static int snd_soc_component_initialize(struct snd_soc_component *component, 
	component->set_sysclk = component->driver->set_sysclk;

	component->set_pll = component->driver->set_pll;

	component->set_jack = component->driver->set_jack;

	component->pcm_new = snd_soc_component_drv_pcm_new;

	component->pcm_free = snd_soc_component_drv_pcm_free;



	dapm = snd_soc_component_get_dapm(component);

	dapm->dev = dev;

sound/soc/soc-pcm.c

+4 −4
Original line number Diff line number Diff line
@@ -2745,8 +2745,8 @@ static void soc_pcm_private_free(struct snd_pcm *pcm) 
	for_each_rtdcom(rtd, rtdcom) {

		component = rtdcom->component;



		if (component->pcm_free)

			component->pcm_free(component, pcm);

		if (component->driver->pcm_free)

			component->driver->pcm_free(pcm);

	}

}
@@ -3012,10 +3012,10 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) 
	for_each_rtdcom(rtd, rtdcom) {

		component = rtdcom->component;



		if (!component->pcm_new)

		if (!component->driver->pcm_new)

			continue;



		ret = component->pcm_new(component, rtd);

		ret = component->driver->pcm_new(rtd);

		if (ret < 0) {

			dev_err(component->dev,

				"ASoC: pcm constructor failed: %d\n",