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

Commit 0a3dcb50 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: Use params_width() at appropriate places 



Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent bc0195aa

sound/soc/codecs/max98925.c

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ static int max98925_dai_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_codec *codec = dai->codec;

	struct max98925_priv *max98925 = snd_soc_codec_get_drvdata(codec);



	switch (snd_pcm_format_width(params_format(params))) {

	switch (params_width(params)) {

	case 16:

		regmap_update_bits(max98925->regmap,

				MAX98925_FORMAT,

sound/soc/codecs/pcm512x.c

+2 −2
Original line number Diff line number Diff line
@@ -1117,7 +1117,7 @@ static int pcm512x_hw_params(struct snd_pcm_substream *substream, 
		params_rate(params),

		params_channels(params));



	switch (snd_pcm_format_width(params_format(params))) {

	switch (params_width(params)) {

	case 16:

		alen = PCM512x_ALEN_16;

		break;
@@ -1132,7 +1132,7 @@ static int pcm512x_hw_params(struct snd_pcm_substream *substream, 
		break;

	default:

		dev_err(codec->dev, "Bad frame size: %d\n",

			snd_pcm_format_width(params_format(params)));

			params_width(params));

		return -EINVAL;

	}

sound/soc/codecs/wm2200.c

+1 −1
Original line number Diff line number Diff line
@@ -1702,7 +1702,7 @@ static int wm2200_hw_params(struct snd_pcm_substream *substream, 
	int *bclk_rates;



	/* Data sizes if not using TDM */

	wl = snd_pcm_format_width(params_format(params));

	wl = params_width(params);

	if (wl < 0)

		return wl;

	fl = snd_soc_params_to_frame_size(params);

sound/soc/codecs/wm5100.c

+1 −1
Original line number Diff line number Diff line
@@ -1408,7 +1408,7 @@ static int wm5100_hw_params(struct snd_pcm_substream *substream, 
	base = dai->driver->base;



	/* Data sizes if not using TDM */

	wl = snd_pcm_format_width(params_format(params));

	wl = params_width(params);

	if (wl < 0)

		return wl;

	fl = snd_soc_params_to_frame_size(params);

sound/soc/codecs/wm8776.c

+2 −2
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static int wm8776_hw_params(struct snd_pcm_substream *substream, 
	}



	/* Set word length */

	switch (snd_pcm_format_width(params_format(params))) {

	switch (params_width(params)) {

	case 16:

		iface = 0;

		break;
@@ -280,7 +280,7 @@ static int wm8776_hw_params(struct snd_pcm_substream *substream, 
		break;

	default:

		dev_err(codec->dev, "Unsupported sample size: %i\n",

			snd_pcm_format_width(params_format(params)));

			params_width(params));

		return -EINVAL;

	}