On Thu, 9 Apr 2015 12:29:14 +0100, Andre Przywara wrote:
> Split the pl011_shutdown() function into smaller chunks to allow
> easier reuse later when adding SBSA support.
>
> Signed-off-by: Andre Przywara <andre.przywara@xxxxxxx>
> ---
> drivers/tty/serial/amba-pl011.c | 58 ++++++++++++++++++++++-----------------
> 1 file changed, 33 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
> index d6a081e..9eb6d13 100644
> --- a/drivers/tty/serial/amba-pl011.c
> +++ b/drivers/tty/serial/amba-pl011.c
> @@ -1635,34 +1635,15 @@ static void pl011_shutdown_channel(struct uart_amba_port *uap,
> writew(val, uap->port.membase + lcrh);
> }
>
> -static void pl011_shutdown(struct uart_port *port)
> +/*
> + * disable the port. It should not disable RTS and DTR.
> + * Also RTS and DTR state should be preserved to restore
> + * it during startup().
> + */
> +static void pl011_disable_uart(struct uart_amba_port *uap)
> {
> - struct uart_amba_port *uap =
> - container_of(port, struct uart_amba_port, port);
> unsigned int cr;
>
> - /*
> - * disable all interrupts
> - */
> - spin_lock_irq(&uap->port.lock);
> - uap->im = 0;
> - writew(uap->im, uap->port.membase + UART011_IMSC);
> - writew(0xffff, uap->port.membase + UART011_ICR);
> - spin_unlock_irq(&uap->port.lock);
> -
> - pl011_dma_shutdown(uap);
> -
> - /*
> - * Free the interrupt
> - */
> - free_irq(uap->port.irq, uap);
> -
> - /*
> - * disable the port
> - * disable the port. It should not disable RTS and DTR.
> - * Also RTS and DTR state should be preserved to restore
> - * it during startup().
> - */
> uap->autorts = false;
> spin_lock_irq(&uap->port.lock);
> cr = readw(uap->port.membase + UART011_CR);
> @@ -1678,6 +1659,33 @@ static void pl011_shutdown(struct uart_port *port)
> pl011_shutdown_channel(uap, uap->lcrh_rx);
> if (uap->lcrh_rx != uap->lcrh_tx)
> pl011_shutdown_channel(uap, uap->lcrh_tx);
> +}
> +
> +static void pl011_disable_interrupts(struct uart_amba_port *uap)
> +{
> + spin_lock_irq(&uap->port.lock);
> + /*
> + * mask all interrupts and clear all pending ones
> + */
No need for a multi-line comment here.
> + uap->im = 0;
> + writew(uap->im, uap->port.membase + UART011_IMSC);
> + writew(0xffff & ~UART011_TXIS, uap->port.membase + UART011_ICR);
The line you removed was:
writew(0xffff, uap->port.membase + UART011_ICR);
Please rebase more carefully.
--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
