diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-12-06 04:59:11 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-12-23 21:17:30 -0500 |
commit | 6db201da2522d7dd231982ff7b83916cf4db3e41 (patch) | |
tree | 85b7920c387d57d7485fcbb2672260781e568591 | |
parent | 8fb9631c517b862267590e7af93615a6ef03394d (diff) |
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>
-rw-r--r-- | drivers/tty/serial/sh-sci.c | 2 | ||||
-rw-r--r-- | include/linux/serial_sci.h | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index e98a217e2fc0..eb59bb235a52 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, | |||
1825 | return (((freq * 2) + 16 * bps) / (16 * bps) - 1); | 1825 | return (((freq * 2) + 16 * bps) / (16 * bps) - 1); |
1826 | case SCBRR_ALGO_4: | 1826 | case SCBRR_ALGO_4: |
1827 | return (((freq * 2) + 16 * bps) / (32 * bps) - 1); | 1827 | return (((freq * 2) + 16 * bps) / (32 * bps) - 1); |
1828 | case SCBRR_ALGO_5: | ||
1829 | return (((freq * 1000 / 32) / bps) - 1); | ||
1830 | } | 1828 | } |
1831 | 1829 | ||
1832 | /* Warn, but use a safe default */ | 1830 | /* Warn, but use a safe default */ |
diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h index 50fe651da965..babc5fe070b9 100644 --- a/include/linux/serial_sci.h +++ b/include/linux/serial_sci.h | |||
@@ -15,7 +15,6 @@ enum { | |||
15 | SCBRR_ALGO_2, /* ((clk + 16 * bps) / (32 * bps) - 1) */ | 15 | SCBRR_ALGO_2, /* ((clk + 16 * bps) / (32 * bps) - 1) */ |
16 | SCBRR_ALGO_3, /* (((clk * 2) + 16 * bps) / (16 * bps) - 1) */ | 16 | SCBRR_ALGO_3, /* (((clk * 2) + 16 * bps) / (16 * bps) - 1) */ |
17 | SCBRR_ALGO_4, /* (((clk * 2) + 16 * bps) / (32 * bps) - 1) */ | 17 | SCBRR_ALGO_4, /* (((clk * 2) + 16 * bps) / (32 * bps) - 1) */ |
18 | SCBRR_ALGO_5, /* (((clk * 1000 / 32) / bps) - 1) */ | ||
19 | SCBRR_ALGO_6, /* HSCIF variable sample rate algorithm */ | 18 | SCBRR_ALGO_6, /* HSCIF variable sample rate algorithm */ |
20 | }; | 19 | }; |
21 | 20 | ||