summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Sakamoto <takashi.sakamoto@miraclelinux.com>2017-03-08 17:47:02 +0900
committerMark Brown <broonie@kernel.org>2017-03-13 16:07:41 +0000
commit998d6fb5123d5b27edd3abd85b767c822bf766fc (patch)
tree51fae3d66b624ce485b000e1c60763e27e4f1595
parent8e15e762cddf68a401df5c6aa45da3c27712e856 (diff)
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") Signed-off-by: Takashi Sakamoto <takashi.sakamoto@miraclelinux.com> Acked-by: Vinod Koul <vinod.koul@intel.com> Tested-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/intel/skylake/skl-topology.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index 17a9a55026a4..e7836a2e18f0 100644
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -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;
}