| From 3a067cff7d5a858a854df2da304168fb6b4c9284 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Fri, 6 Dec 2013 10:59:11 +0100 |
| Subject: serial: sh-sci: Remove baud rate calculation algorithm 5 |
| |
| The algorithm isn't used, remove it. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 6db201da2522d7dd231982ff7b83916cf4db3e41) |
| (Queued by Simon Horman for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/tty/serial/sh-sci.c | 2 -- |
| include/linux/serial_sci.h | 1 - |
| 2 files changed, 3 deletions(-) |
| |
| diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c |
| index 6e54c440da5e..80a91038c821 100644 |
| --- a/drivers/tty/serial/sh-sci.c |
| +++ b/drivers/tty/serial/sh-sci.c |
| @@ -1825,8 +1825,6 @@ static unsigned int sci_scbrr_calc(unsigned int algo_id, unsigned int bps, |
| return (((freq * 2) + 16 * bps) / (16 * bps) - 1); |
| case SCBRR_ALGO_4: |
| return (((freq * 2) + 16 * bps) / (32 * bps) - 1); |
| - case SCBRR_ALGO_5: |
| - return (((freq * 1000 / 32) / bps) - 1); |
| } |
| |
| /* Warn, but use a safe default */ |
| diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h |
| index d34049712a4d..803068d764fb 100644 |
| --- a/include/linux/serial_sci.h |
| +++ b/include/linux/serial_sci.h |
| @@ -15,7 +15,6 @@ enum { |
| 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_5, /* (((clk * 1000 / 32) / bps) - 1) */ |
| SCBRR_ALGO_6, /* HSCIF variable sample rate algorithm */ |
| }; |
| |
| -- |
| 1.8.5.rc3 |
| |
