lkml.org 
[lkml]   [2015]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/25] serial: sh-sci: Drop useless check for zero sampling_rate
    Date
    sci_port.sampling_rate is always non-zero, except for HSCIF, which uses
    sci_baud_calc_hscif() instead of sci_scbrr_calc().

    Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
    ---
    drivers/tty/serial/sh-sci.c | 8 +-------
    1 file changed, 1 insertion(+), 7 deletions(-)

    diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
    index bee5b7025adf45a2..ae136a1632e6298d 100644
    --- a/drivers/tty/serial/sh-sci.c
    +++ b/drivers/tty/serial/sh-sci.c
    @@ -1863,13 +1863,7 @@ static void sci_shutdown(struct uart_port *port)
    static unsigned int sci_scbrr_calc(struct sci_port *s, unsigned int bps,
    unsigned long freq)
    {
    - if (s->sampling_rate)
    - return DIV_ROUND_CLOSEST(freq, s->sampling_rate * bps) - 1;
    -
    - /* Warn, but use a safe default */
    - WARN_ON(1);
    -
    - return ((freq + 16 * bps) / (32 * bps) - 1);
    + return DIV_ROUND_CLOSEST(freq, s->sampling_rate * bps) - 1;
    }

    /* calculate frame length from SMR */
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-11-19 20:01    [W:3.012 / U:0.732 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site