ASoC: Intel: Skylake: use a helper macro to rounding-up calculation
Subsystems (3)
PATCH 1/1 ASoC: Intel: Skylake: use a helper macro to rounding-up calculation
In 'include/linux/kernel.h', there's a helper macro to round numerical value. Let's use it.
--- sound/soc/intel/skylake/skl-topology.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)
sound/soc/intel/skylake/skl-topology.c +4 -14
@@ -299,8 +299,6 @@ static void skl_tplg_update_buffer_size(struct skl_sst *ctx, {int multiplier =1 ;struct skl_module_fmt *in_fmt, *out_fmt; -int in_rate, out_rate; -/* Since fixups is applied to pin 0 only, ibs, obs needs * change for pin 0 only
@@ -311,21 +309,13 @@ static void skl_tplg_update_buffer_size(struct skl_sst *ctx,if (mcfg->m_type ==SKL_MODULE_TYPE_SRCINT ) multiplier =5 ; -if (in_fmt->s_freq %1000 ) - in_rate = (in_fmt->s_freq /1000 ) +1 ; -else - in_rate = (in_fmt->s_freq /1000 ); - - mcfg->ibs = in_rate * (mcfg->in_fmt->channels) * + mcfg->ibs =DIV_ROUND_UP (in_fmt->s_freq,1000 ) * + (mcfg->in_fmt->channels) * (mcfg->in_fmt->bit_depth >>3 ) * multiplier; -if (mcfg->out_fmt->s_freq %1000 ) - out_rate = (mcfg->out_fmt->s_freq /1000 ) +1 ; -else - out_rate = (mcfg->out_fmt->s_freq /1000 ); - - mcfg->obs = out_rate * (mcfg->out_fmt->channels) * + mcfg->obs =DIV_ROUND_UP (mcfg->out_fmt->s_freq,1000 ) * + (mcfg->out_fmt->channels) * (mcfg->out_fmt->bit_depth >>3 ) * multiplier; }
Signature · 1 line
2.9.3
Quoted 5 lines · Takashi Sakamoto
In '
include/linux/kernel.h', there's a helper macro to round numerical value. Let's use it.Cc Takashi Sakamoto <[email protected]>Signed-off-by Takashi Sakamoto <[email protected]>
Thanks Takashi-San for this.
Signature · 1 line
~Vinod
Mark Brown
maintainerApplied "ASoC: Intel: Skylake: use a helper macro to rounding-up calculation" to the asoc tree
In reply to Takashi SakamotoThe patch
ASoC: Intel: Skylake: use a helper macro to rounding-up calculation
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
8e15e762cddf68a401df5c6aa45da3c27712e856Mon Sep 17 00:00:00 2001
From: Takashi Sakamoto <[email protected]>
Date: Mon, 6 Mar 2017 16:12:22 +0900
Subject: [PATCH] ASoC: Intel: Skylake: use a helper macro to rounding-up
calculation
In 'include/linux/kernel.h', there's a helper macro to round numerical value. Let's use it.
--- sound/soc/intel/skylake/skl-topology.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)
sound/soc/intel/skylake/skl-topology.c +4 -14
@@ -299,8 +299,6 @@ static void skl_tplg_update_buffer_size(struct skl_sst *ctx, {int multiplier =1 ;struct skl_module_fmt *in_fmt, *out_fmt; -int in_rate, out_rate; -/* Since fixups is applied to pin 0 only, ibs, obs needs * change for pin 0 only
@@ -311,21 +309,13 @@ static void skl_tplg_update_buffer_size(struct skl_sst *ctx,if (mcfg->m_type ==SKL_MODULE_TYPE_SRCINT ) multiplier =5 ; -if (in_fmt->s_freq %1000 ) - in_rate = (in_fmt->s_freq /1000 ) +1 ; -else - in_rate = (in_fmt->s_freq /1000 ); - - mcfg->ibs = in_rate * (mcfg->in_fmt->channels) * + mcfg->ibs =DIV_ROUND_UP (in_fmt->s_freq,1000 ) * + (mcfg->in_fmt->channels) * (mcfg->in_fmt->bit_depth >>3 ) * multiplier; -if (mcfg->out_fmt->s_freq %1000 ) - out_rate = (mcfg->out_fmt->s_freq /1000 ) +1 ; -else - out_rate = (mcfg->out_fmt->s_freq /1000 ); - - mcfg->obs = out_rate * (mcfg->out_fmt->channels) * + mcfg->obs =DIV_ROUND_UP (mcfg->out_fmt->s_freq,1000 ) * + (mcfg->out_fmt->channels) * (mcfg->out_fmt->bit_depth >>3 ) * multiplier; }
Signature · 1 line
2.11.0