ASoC: Use params_width() at appropriate places

PATCH In review Axel Lin 2 participants 2 messages Jul 24, 2015

Subsystems (4)

Sound ASoC Wolfson microelectronics drivers Texas Instruments audio (ASoC/HDA) drivers

lore

Share & tools

lore

Axel Lin

author

2015-07-24 08:11 UTC #0 lore raw

PATCH 1/1 ASoC: Use params_width() at appropriate places

Signed-off-by Axel Lin <[email protected]>

---
 sound/soc/codecs/max98925.c | 2 +-
 sound/soc/codecs/pcm512x.c  | 4 ++--
 sound/soc/codecs/wm2200.c   | 2 +-
 sound/soc/codecs/wm5100.c   | 2 +-
 sound/soc/codecs/wm8776.c   | 4 ++--
 sound/soc/codecs/wm8996.c   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

sound/soc/codecs/max98925.c +1 -1

index ebb648a..5990de3 100644
@@ -430,7 +430,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

index de16429..047c489 100644
@@ -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

index 35199fc..fd1439e 100644
@@ -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

index 8120b0c..c2cdcae 100644
@@ -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

index 592866d..183c9a4 100644
@@ -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;
 	}

sound/soc/codecs/wm8996.c +1 -1

index 2a696db..f7ccd9f 100644
@@ -1780,7 +1780,7 @@ static int wm8996_hw_params(struct snd_pcm_substream *substream,
 	wm8996->rx_rate[dai->id] = params_rate(params);
 
 	/* Needs looking at for TDM */
-	bits = snd_pcm_format_width(params_format(params));
+	bits = params_width(params);
 	if (bits < 0)
 		return bits;
 	aifdata |= (bits << WM8996_AIF1TX_WL_SHIFT) | bits;

Signature · 1 line

2.1.0

Mark Brown

maintainer

2015-07-24 17:32 UTC #1 lore raw

Applied "ASoC: Use params_width() at appropriate places" to the asoc tree

The patch

ASoC: Use params_width() at appropriate places

has been applied to the asoc tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Quoted 1 line

From 0a3dcb509ae7701ba3eaf470cad91827821daf41 Mon Sep 17 00:00:00 2001

From: Axel Lin <[email protected]>
Date: Fri, 24 Jul 2015 16:11:25 +0800
Subject: [PATCH] ASoC: Use params_width() at appropriate places