From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Date: Thu, 19 Nov 2015 20:36:13 +0000 Subject: Re: [PATCH 08/25] serial: sh-sci: Make unsigned values in sci_baud_calc_hscif() unsigned Message-Id: <1636784.2d3bsCa4Hn@avalon> List-Id: References: <1447958344-836-1-git-send-email-geert+renesas@glider.be> <1447958344-836-9-git-send-email-geert+renesas@glider.be> In-Reply-To: <1447958344-836-9-git-send-email-geert+renesas@glider.be> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Geert Uytterhoeven Cc: Greg Kroah-Hartman , Simon Horman , Magnus Damm , Yoshinori Sato , linux-serial@vger.kernel.org, linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org Hi Geert, Thank you for the patch. On Thursday 19 November 2015 19:38:47 Geert Uytterhoeven wrote: > 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 > --- > drivers/tty/serial/sh-sci.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c > index 9442961a198378c7..fba1e1eea15dc3a1 100644 > --- a/drivers/tty/serial/sh-sci.c > +++ b/drivers/tty/serial/sh-sci.c > @@ -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, 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 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++) { > /* integerized formulas from HSCIF documentation */ > br = DIV_ROUND_CLOSEST(freq, (sr * > - (1 << (2 * c + 1)) * bps)) - 1; > - br = clamp(br, 0, 255); > - err = DIV_ROUND_CLOSEST(freq, ((br + 1) * bps * sr * > + (1 << (2 * c + 1)) * bps)); > + br = clamp(br, 1U, 256U); > + err = DIV_ROUND_CLOSEST(freq, (br * bps * sr * > (1 << (2 * c + 1)) / 1000)) - > 1000; While you're at it you can remove the parentheses around the second argument to DIV_ROUND_CLOSEST, they're not needed. > /* Calc recv margin > @@ -1908,7 +1909,7 @@ static void sci_baud_calc_hscif(unsigned int bps, > unsigned long freq, int *brr, else > continue; > > - *brr = br; > + *brr = br - 1; > *srr = sr - 1; > *cks = c; > } -- Regards, Laurent Pinchart From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161446AbbKSUgL (ORCPT ); Thu, 19 Nov 2015 15:36:11 -0500 Received: from galahad.ideasonboard.com ([185.26.127.97]:33047 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161170AbbKSUgF (ORCPT ); Thu, 19 Nov 2015 15:36:05 -0500 From: Laurent Pinchart To: Geert Uytterhoeven Cc: Greg Kroah-Hartman , Simon Horman , Magnus Damm , Yoshinori Sato , linux-serial@vger.kernel.org, linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 08/25] serial: sh-sci: Make unsigned values in sci_baud_calc_hscif() unsigned Date: Thu, 19 Nov 2015 22:36:13 +0200 Message-ID: <1636784.2d3bsCa4Hn@avalon> User-Agent: KMail/4.14.8 (Linux/4.0.9-gentoo; KDE/4.14.8; x86_64; ; ) In-Reply-To: <1447958344-836-9-git-send-email-geert+renesas@glider.be> References: <1447958344-836-1-git-send-email-geert+renesas@glider.be> <1447958344-836-9-git-send-email-geert+renesas@glider.be> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Geert, Thank you for the patch. On Thursday 19 November 2015 19:38:47 Geert Uytterhoeven wrote: > 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 > --- > drivers/tty/serial/sh-sci.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c > index 9442961a198378c7..fba1e1eea15dc3a1 100644 > --- a/drivers/tty/serial/sh-sci.c > +++ b/drivers/tty/serial/sh-sci.c > @@ -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, 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 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++) { > /* integerized formulas from HSCIF documentation */ > br = DIV_ROUND_CLOSEST(freq, (sr * > - (1 << (2 * c + 1)) * bps)) - 1; > - br = clamp(br, 0, 255); > - err = DIV_ROUND_CLOSEST(freq, ((br + 1) * bps * sr * > + (1 << (2 * c + 1)) * bps)); > + br = clamp(br, 1U, 256U); > + err = DIV_ROUND_CLOSEST(freq, (br * bps * sr * > (1 << (2 * c + 1)) / 1000)) - > 1000; While you're at it you can remove the parentheses around the second argument to DIV_ROUND_CLOSEST, they're not needed. > /* Calc recv margin > @@ -1908,7 +1909,7 @@ static void sci_baud_calc_hscif(unsigned int bps, > unsigned long freq, int *brr, else > continue; > > - *brr = br; > + *brr = br - 1; > *srr = sr - 1; > *cks = c; > } -- Regards, Laurent Pinchart