Skip to contentSkip to conversation

ASoC: Intel: Skylake: code cleanup for pin fixup limitation

PATCH In review Takashi Sakamoto 3 participants 3 messages Mar 8, 2017 – Mar 13, 2017

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: Intel: Skylake: code cleanup for pin fixup limitation

As a commit 4cd9899f0d16 ("ASoC: Intel: Skylake: Add multiple pin formats") describes, 'fixups is applied to pin 0 only'. On the other hand, the commit left some codes as what they were. This might confuses readers.

This commit fixes the issue. This doesn't change driver behaviour at all.

Fixes 4cd9899f0d16 ("ASoC: Intel: Skylake: Add multiple pin formats")
---
 sound/soc/intel/skylake/skl-topology.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
sound/soc/intel/skylake/skl-topology.c +3 -5
index f38f8e6..8651359 100644
@@ -310,13 +310,11 @@ static void skl_tplg_update_buffer_size(struct skl_sst *ctx,
 		multiplier = 5;
 
 	mcfg->ibs = DIV_ROUND_UP(in_fmt->s_freq, 1000) *
-			(mcfg->in_fmt->channels) *
-			(mcfg->in_fmt->bit_depth >> 3) *
+			in_fmt->channels * (in_fmt->bit_depth >> 3) *
 			multiplier;
 
-	mcfg->obs = DIV_ROUND_UP(mcfg->out_fmt->s_freq, 1000) *
-			(mcfg->out_fmt->channels) *
-			(mcfg->out_fmt->bit_depth >> 3) *
+	mcfg->obs = DIV_ROUND_UP(out_fmt->s_freq, 1000) *
+			out_fmt->channels * (out_fmt->bit_depth >> 3) *
 			multiplier;
 }
 
Signature · 1 line
2.9.3
Acked-by Tested-by Subhransu S. Prusty on v1 1/1
#1 lore raw

Hi Takashi-San,

Quoted 6 lines · Takashi Sakamoto

As a commit 4cd9899f0d16 ("ASoC: Intel: Skylake: Add multiple pin formats") describes, 'fixups is applied to pin 0 only'. On the other hand, the commit left some codes as what they were. This might confuses readers.

This commit fixes the issue. This doesn't change driver behaviour at all.

Thanks, this also looks good. So,

Quoted 31 lines
Fixes 4cd9899f0d16 ("ASoC: Intel: Skylake: Add multiple pin formats")
---
 sound/soc/intel/skylake/skl-topology.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
sound/soc/intel/skylake/skl-topology.c +3 -5
index f38f8e6..8651359 100644
@@ -310,13 +310,11 @@ static void skl_tplg_update_buffer_size(struct skl_sst *ctx,
 		multiplier = 5;
 
 	mcfg->ibs = DIV_ROUND_UP(in_fmt->s_freq, 1000) *
-			(mcfg->in_fmt->channels) *
-			(mcfg->in_fmt->bit_depth >> 3) *
+			in_fmt->channels * (in_fmt->bit_depth >> 3) *
 			multiplier;
 
-	mcfg->obs = DIV_ROUND_UP(mcfg->out_fmt->s_freq, 1000) *
-			(mcfg->out_fmt->channels) *
-			(mcfg->out_fmt->bit_depth >> 3) *
+	mcfg->obs = DIV_ROUND_UP(out_fmt->s_freq, 1000) *
+			out_fmt->channels * (out_fmt->bit_depth >> 3) *
 			multiplier;
 }
 
Signature · 1 line
2.9.3
Signature · 1 line
~Vinod
maintainer
#2 lore raw

Applied "ASoC: Intel: Skylake: code cleanup for pin fixup limitation" to the asoc tree

In reply to Takashi Sakamoto

The patch

ASoC: Intel: Skylake: code cleanup for pin fixup limitation

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 998d6fb5123d5b27edd3abd85b767c822bf766fc Mon Sep 17 00:00:00 2001

From: Takashi Sakamoto <[email protected]>
Date: Wed, 8 Mar 2017 17:47:02 +0900
Subject: [PATCH] ASoC: Intel: Skylake: code cleanup for pin fixup limitation

As a commit 4cd9899f0d16 ("ASoC: Intel: Skylake: Add multiple pin formats") describes, 'fixups is applied to pin 0 only'. On the other hand, the commit left some codes as what they were. This might confuses readers.

This commit fixes the issue. This doesn't change driver behaviour at all.

Fixes 4cd9899f0d16 ("ASoC: Intel: Skylake: Add multiple pin formats")
---
 sound/soc/intel/skylake/skl-topology.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
sound/soc/intel/skylake/skl-topology.c +3 -5
index 17a9a55026a4..e7836a2e18f0 100644
@@ -310,13 +310,11 @@ static void skl_tplg_update_buffer_size(struct skl_sst *ctx,
 		multiplier = 5;
 
 	mcfg->ibs = DIV_ROUND_UP(in_fmt->s_freq, 1000) *
-			(mcfg->in_fmt->channels) *
-			(mcfg->in_fmt->bit_depth >> 3) *
+			in_fmt->channels * (in_fmt->bit_depth >> 3) *
 			multiplier;
 
-	mcfg->obs = DIV_ROUND_UP(mcfg->out_fmt->s_freq, 1000) *
-			(mcfg->out_fmt->channels) *
-			(mcfg->out_fmt->bit_depth >> 3) *
+	mcfg->obs = DIV_ROUND_UP(out_fmt->s_freq, 1000) *
+			out_fmt->channels * (out_fmt->bit_depth >> 3) *
 			multiplier;
 }
 
Signature · 1 line
2.11.0