| Message ID | 20170308084702.20558-1-takashi.sakamoto@miraclelinux.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 998d6fb5123d5b27edd3abd85b767c822bf766fc |
| Headers | show |
Hi Takashi-San, On Wed, Mar 08, 2017 at 05:47:02PM +0900, Takashi Sakamoto wrote: > 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, Acked-by: Vinod Koul <vinod.koul@intel.com> Tested-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com> > > Fixes: 4cd9899f0d16 ("ASoC: Intel: Skylake: Add multiple pin formats") > Signed-off-by: Takashi Sakamoto <takashi.sakamoto@miraclelinux.com> > --- > sound/soc/intel/skylake/skl-topology.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c > index f38f8e6..8651359 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; > } > > -- > 2.9.3 >
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index f38f8e6..8651359 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; }
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> --- sound/soc/intel/skylake/skl-topology.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)