Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

serial: sh-sci: Make unsigned values in sci_baud_calc_hscif() unsigned

Browse source 
Move the -1 offset of br to the assignment to *brr, so br cannot become
negative anymore, and update the clamp() call. Now all unsigned values
in sci_baud_calc_hscif() can become unsigned.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Geert Uytterhoeven 2015-11-13 16:56:08 +01:00
parent f4de472ef2
commit 95a2703e36
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/tty/serial/sh-sci.c
View file

@ -1870,7 +1870,8 @@ static unsigned int sci_scbrr_calc(struct sci_port *s, unsigned int bps,
static void sci_baud_calc_hscif(unsigned int bps, unsigned long freq, int *brr, static void sci_baud_calc_hscif(unsigned int bps, unsigned long freq, int *brr,
unsigned int *srr, unsigned int *cks) unsigned int *srr, unsigned int *cks)
{ {
int sr, c, br, err, recv_margin; unsigned int sr, br, c;
int err, recv_margin;
int min_err = 1000; /* 100% */ int min_err = 1000; /* 100% */
int recv_max_margin = 0; int recv_max_margin = 0;
@ -1880,9 +1881,9 @@ static void sci_baud_calc_hscif(unsigned int bps, unsigned long freq, int *brr,
for (c = 0; c <= 3; c++) { for (c = 0; c <= 3; c++) {
/* integerized formulas from HSCIF documentation */ /* integerized formulas from HSCIF documentation */
br = DIV_ROUND_CLOSEST(freq, (sr * br = DIV_ROUND_CLOSEST(freq, (sr *
(1 << (2 * c + 1)) * bps)) - 1; (1 << (2 * c + 1)) * bps));
br = clamp(br, 0, 255); br = clamp(br, 1U, 256U);
err = DIV_ROUND_CLOSEST(freq, ((br + 1) * bps * sr * err = DIV_ROUND_CLOSEST(freq, (br * bps * sr *
(1 << (2 * c + 1)) / 1000)) - (1 << (2 * c + 1)) / 1000)) -
1000; 1000;
/* Calc recv margin /* Calc recv margin
@ -1908,7 +1909,7 @@ static void sci_baud_calc_hscif(unsigned int bps, unsigned long freq, int *brr,
else else
continue; continue;
*brr = br; *brr = br - 1;
*srr = sr - 1; *srr = sr - 1;
*cks = c; *cks = c;
} }