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

ASoC: soc-dai: mv soc_dai_hw_params() to soc-dai 



Sometimes ALSA SoC naming is very random.
Current soc_dai_hw_params() should use snd_soc_dai_xxx() style.
And then, 1st parameter should be dai. Otherwise it is confusable.
 - soc_dai_hw_params(..., dai);
 + snd_soc_dai_hw_params(dai, ...);

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


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

include/sound/soc-dai.h

+4 −0
Original line number Diff line number Diff line
@@ -145,6 +145,10 @@ int snd_soc_dai_get_channel_map(struct snd_soc_dai *dai, 


int snd_soc_dai_is_dummy(struct snd_soc_dai *dai);



int snd_soc_dai_hw_params(struct snd_soc_dai *dai,

			  struct snd_pcm_substream *substream,

			  struct snd_pcm_hw_params *params);



struct snd_soc_dai_ops {

	/*

	 * DAI clocking configuration, all optional.

include/sound/soc.h

+0 −4
Original line number Diff line number Diff line
@@ -505,10 +505,6 @@ int snd_soc_params_to_bclk(struct snd_pcm_hw_params *parms); 
int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,

	const struct snd_pcm_hardware *hw);



int soc_dai_hw_params(struct snd_pcm_substream *substream,

		      struct snd_pcm_hw_params *params,

		      struct snd_soc_dai *dai);



/* Jack reporting */

int snd_soc_card_jack_new(struct snd_soc_card *card, const char *id, int type,

	struct snd_soc_jack *jack, struct snd_soc_jack_pin *pins,

sound/soc/soc-dai.c

+30 −0
Original line number Diff line number Diff line
@@ -252,3 +252,33 @@ int snd_soc_dai_digital_mute(struct snd_soc_dai *dai, int mute, 
		return -ENOTSUPP;

}

EXPORT_SYMBOL_GPL(snd_soc_dai_digital_mute);



int snd_soc_dai_hw_params(struct snd_soc_dai *dai,

			  struct snd_pcm_substream *substream,

			  struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	int ret;



	/* perform any topology hw_params fixups before DAI  */

	if (rtd->dai_link->be_hw_params_fixup) {

		ret = rtd->dai_link->be_hw_params_fixup(rtd, params);

		if (ret < 0) {

			dev_err(rtd->dev,

				"ASoC: hw_params topology fixup failed %d\n",

				ret);

			return ret;

		}

	}



	if (dai->driver->ops->hw_params) {

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

		if (ret < 0) {

			dev_err(dai->dev, "ASoC: can't set %s hw params: %d\n",

				dai->name, ret);

			return ret;

		}

	}



	return 0;

}

sound/soc/soc-dapm.c

+2 −2
Original line number Diff line number Diff line
@@ -3839,7 +3839,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w, 
				}

			}

			source->active++;

			ret = soc_dai_hw_params(&substream, params, source);

			ret = snd_soc_dai_hw_params(source, &substream, params);

			if (ret < 0)

				goto out;
@@ -3861,7 +3861,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w, 
				}

			}

			sink->active++;

			ret = soc_dai_hw_params(&substream, params, sink);

			ret = snd_soc_dai_hw_params(sink, &substream, params);

			if (ret < 0)

				goto out;

sound/soc/soc-pcm.c

+3 −32
Original line number Diff line number Diff line
@@ -877,36 +877,6 @@ static void soc_pcm_codec_params_fixup(struct snd_pcm_hw_params *params, 
	interval->max = channels;

}



int soc_dai_hw_params(struct snd_pcm_substream *substream,

		      struct snd_pcm_hw_params *params,

		      struct snd_soc_dai *dai)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	int ret;



	/* perform any topology hw_params fixups before DAI  */

	if (rtd->dai_link->be_hw_params_fixup) {

		ret = rtd->dai_link->be_hw_params_fixup(rtd, params);

		if (ret < 0) {

			dev_err(rtd->dev,

				"ASoC: hw_params topology fixup failed %d\n",

				ret);

			return ret;

		}

	}



	if (dai->driver->ops->hw_params) {

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

		if (ret < 0) {

			dev_err(dai->dev, "ASoC: can't set %s hw params: %d\n",

				dai->name, ret);

			return ret;

		}

	}



	return 0;

}



static int soc_pcm_components_hw_free(struct snd_pcm_substream *substream,

				      struct snd_soc_component *last)

{
@@ -989,7 +959,8 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, 
			soc_pcm_codec_params_fixup(&codec_params,

						   codec_dai->rx_mask);



		ret = soc_dai_hw_params(substream, &codec_params, codec_dai);

		ret = snd_soc_dai_hw_params(codec_dai, substream,

					    &codec_params);

		if(ret < 0)

			goto codec_err;
@@ -1001,7 +972,7 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, 
		snd_soc_dapm_update_dai(substream, &codec_params, codec_dai);

	}



	ret = soc_dai_hw_params(substream, params, cpu_dai);

	ret = snd_soc_dai_hw_params(cpu_dai, substream, params);

	if (ret < 0)

		goto interface_err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE