2 files changed, 8 insertions, 8 deletions

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index eb59bb235a52..f2fad4d8eb9e 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1818,13 +1818,13 @@ static unsigned int sci_scbrr_calc(unsigned int algo_id, unsigned int bps,
 {
         switch (algo_id) {
         case SCBRR_ALGO_1:
-                return ((freq + 16 * bps) / (16 * bps) - 1);
+                return freq / (16 * bps);
         case SCBRR_ALGO_2:
-                return ((freq + 16 * bps) / (32 * bps) - 1);
+                return DIV_ROUND_CLOSEST(freq, 32 * bps) - 1;
         case SCBRR_ALGO_3:
-                return (((freq * 2) + 16 * bps) / (16 * bps) - 1);
+                return freq / (8 * bps);
         case SCBRR_ALGO_4:
-                return (((freq * 2) + 16 * bps) / (32 * bps) - 1);
+                return DIV_ROUND_CLOSEST(freq, 16 * bps) - 1;
         }
 
         /* Warn, but use a safe default */
diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h
index babc5fe070b9..12cf50c1c047 100644
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@ -11,10 +11,10 @@
 #define SCIx_NOT_SUPPORTED      (-1)
 
 enum {
-        SCBRR_ALGO_1,           /* ((clk + 16 * bps) / (16 * bps) - 1) */
-        SCBRR_ALGO_2,           /* ((clk + 16 * bps) / (32 * bps) - 1) */
-        SCBRR_ALGO_3,           /* (((clk * 2) + 16 * bps) / (16 * bps) - 1) */
-        SCBRR_ALGO_4,           /* (((clk * 2) + 16 * bps) / (32 * bps) - 1) */
+        SCBRR_ALGO_1,           /* clk / (16 * bps) */
+        SCBRR_ALGO_2,           /* DIV_ROUND_CLOSEST(clk, 32 * bps) - 1 */
+        SCBRR_ALGO_3,           /* clk / (8 * bps) */
+        SCBRR_ALGO_4,           /* DIV_ROUND_CLOSEST(clk, 16 * bps) - 1 */
         SCBRR_ALGO_6,           /* HSCIF variable sample rate algorithm */
 };