[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH 1/3] xen/arm: drivers: scif: Remove dead code
Hi, Dirk. On Tue, Jun 21, 2016 at 12:15 PM, Dirk Behme <dirk.behme@xxxxxxxxxxxx> wrote: > In scif_uart_init() uart->baud is set to BAUD_AUTO. So its a basic error > if this is different later. Detect this by an ASSERT, but remove the > dead code normally never reached. > > Signed-off-by: Dirk Behme <dirk.behme@xxxxxxxxxxxx> > --- > xen/drivers/char/scif-uart.c | 23 ++++++----------------- > 1 file changed, 6 insertions(+), 17 deletions(-) > > diff --git a/xen/drivers/char/scif-uart.c b/xen/drivers/char/scif-uart.c > index 51a2233..ca88c0f 100644 > --- a/xen/drivers/char/scif-uart.c > +++ b/xen/drivers/char/scif-uart.c > @@ -143,23 +143,12 @@ static void __init scif_uart_init_preirq(struct > serial_port *port) > scif_writew(uart, SCIF_SCSMR, val); > > ASSERT( uart->clock_hz > 0 ); > - if ( uart->baud != BAUD_AUTO ) > - { > - /* Setup desired Baud rate */ > - divisor = uart->clock_hz / (uart->baud << 4); > - ASSERT( divisor >= 1 && divisor <= (uint16_t)UINT_MAX ); > - scif_writew(uart, SCIF_DL, (uint16_t)divisor); > - /* Selects the frequency divided clock (SC_CLK external input) */ > - scif_writew(uart, SCIF_CKS, 0); > - udelay(1000000 / uart->baud + 1); This part of code might be used for people who are not satisfied with default baudrate which has been set in U-Boot. If we remove this we will take away the opportunity to just change uart->baud from BAUD_AUTO to desired one. > - } > - else > - { > - /* Read current Baud rate */ > - divisor = scif_readw(uart, SCIF_DL); > - ASSERT( divisor >= 1 && divisor <= (uint16_t)UINT_MAX ); > - uart->baud = uart->clock_hz / (divisor << 4); > - } > + ASSERT( uart->baud == BAUD_AUTO ); > + > + /* Read current Baud rate */ > + divisor = scif_readw(uart, SCIF_DL); > + ASSERT( divisor >= 1 && divisor <= (uint16_t)UINT_MAX ); > + uart->baud = uart->clock_hz / (divisor << 4); > > /* Setup trigger level for TX/RX FIFOs */ > scif_writew(uart, SCIF_SCFCR, SCFCR_RTRG11 | SCFCR_TTRG11); > -- > 2.8.0 > -- Oleksandr Tyshchenko | Embedded Dev GlobalLogic www.globallogic.com _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |