Skip to content

Commit

Permalink
ASoC: fsl-ssi: fix do_div build warning in fsl_ssi_set_bclk()
Browse files Browse the repository at this point in the history
do_div() requires that the first parameter is a 64-bit integer,
which but clkrate was defined as an unsigned long.  This caused
the following warnings:

 CC      sound/soc/fsl/fsl_ssi.o
sound/soc/fsl/fsl_ssi.c: In function 'fsl_ssi_set_bclk':
sound/soc/fsl/fsl_ssi.c:593:3: warning: comparison of distinct pointer types lacks a cast
sound/soc/fsl/fsl_ssi.c:593:3: warning: right shift count >= width of type
sound/soc/fsl/fsl_ssi.c:593:3: warning: passing argument 1 of '__div64_32' from incompatible pointer type
include/asm-generic/div64.h:35:17: note: expected 'uint64_t *' but argument is of type 'long unsigned int *'

Signed-off-by: Timur Tabi <timur@tabi.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Timur Tabi authored and Mark Brown committed Jun 17, 2014
1 parent 3d5f615 commit acf2c60
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sound/soc/fsl/fsl_ssi.c
Original file line number Diff line number Diff line change
Expand Up @@ -590,8 +590,8 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream,
else
clkrate = clk_round_rate(ssi_private->baudclk, tmprate);

do_div(clkrate, factor);
afreq = (u32)clkrate / (i + 1);
clkrate /= factor;
afreq = clkrate / (i + 1);

if (freq == afreq)
sub = 0;
Expand Down

0 comments on commit acf2c60

Please sign in to comment.