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

ASoC: simple-card-utils: remove asoc_simple_convert_fixup() 



No one is using asoc_simple_convert_fixup(), we don't need to
export its symbol. This patch removes it.

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


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

include/sound/simple_card_utils.h

+0 −2
Original line number Diff line number Diff line
@@ -173,8 +173,6 @@ void asoc_simple_canonicalize_cpu(struct snd_soc_dai_link_component *cpus, 


void asoc_simple_clean_reference(struct snd_soc_card *card);



void asoc_simple_convert_fixup(struct asoc_simple_data *data,

				      struct snd_pcm_hw_params *params);

void asoc_simple_parse_convert(struct device_node *np, char *prefix,

			       struct asoc_simple_data *data);

bool asoc_simple_is_convert_required(const struct asoc_simple_data *data);

sound/soc/generic/simple-card-utils.c

+13 −22
Original line number Diff line number Diff line
@@ -41,27 +41,6 @@ static void asoc_simple_fixup_sample_fmt(struct asoc_simple_data *data, 
	}

}



void asoc_simple_convert_fixup(struct asoc_simple_data *data,

			       struct snd_pcm_hw_params *params)

{

	struct snd_interval *rate = hw_param_interval(params,

						SNDRV_PCM_HW_PARAM_RATE);

	struct snd_interval *channels = hw_param_interval(params,

						SNDRV_PCM_HW_PARAM_CHANNELS);



	if (data->convert_rate)

		rate->min =

		rate->max = data->convert_rate;



	if (data->convert_channels)

		channels->min =

		channels->max = data->convert_channels;



	if (data->convert_sample_format)

		asoc_simple_fixup_sample_fmt(data, params);

}

EXPORT_SYMBOL_GPL(asoc_simple_convert_fixup);



void asoc_simple_parse_convert(struct device_node *np,

			       char *prefix,

			       struct asoc_simple_data *data)
@@ -522,8 +501,20 @@ int asoc_simple_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
{

	struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card);

	struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num);

	struct asoc_simple_data *data = &dai_props->adata;

	struct snd_interval *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);

	struct snd_interval *channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);



	if (data->convert_rate)

		rate->min =

		rate->max = data->convert_rate;



	asoc_simple_convert_fixup(&dai_props->adata, params);

	if (data->convert_channels)

		channels->min =

		channels->max = data->convert_channels;



	if (data->convert_sample_format)

		asoc_simple_fixup_sample_fmt(data, params);



	return 0;

}