Le 30/09/2015 10:19, Uwe Kleine-König a écrit :
> This commit also fixes compiler warnings and errors seen when building
> on x86_64.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Sure:
Acked-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
> ---
> drivers/tty/serial/Kconfig | 4 ++--
> drivers/tty/serial/atmel_serial.c | 12 ++++++------
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
> index 687b1ea294b7..e54b32b44d57 100644
> --- a/drivers/tty/serial/Kconfig
> +++ b/drivers/tty/serial/Kconfig
> @@ -115,9 +115,9 @@ config SERIAL_SB1250_DUART_CONSOLE
>
> config SERIAL_ATMEL
> bool "AT91 / AT32 on-chip serial port support"
> - depends on ARCH_AT91 || AVR32
> + depends on ARCH_AT91 || AVR32 || COMPILE_TEST
> select SERIAL_CORE
> - select SERIAL_MCTRL_GPIO
> + select SERIAL_MCTRL_GPIO if GPIOLIB
> help
> This enables the driver for the on-chip UARTs of the Atmel
> AT91 and AT32 processors.
> diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
> index 538ea03bc101..967a796872cb 100644
> --- a/drivers/tty/serial/atmel_serial.c
> +++ b/drivers/tty/serial/atmel_serial.c
> @@ -921,7 +921,7 @@ static int atmel_prepare_tx_dma(struct uart_port *port)
> sg_set_page(&atmel_port->sg_tx,
> virt_to_page(port->state->xmit.buf),
> UART_XMIT_SIZE,
> - (int)port->state->xmit.buf & ~PAGE_MASK);
> + (unsigned long)port->state->xmit.buf & ~PAGE_MASK);
> nent = dma_map_sg(port->dev,
> &atmel_port->sg_tx,
> 1,
> @@ -931,10 +931,10 @@ static int atmel_prepare_tx_dma(struct uart_port *port)
> dev_dbg(port->dev, "need to release resource of dma\n");
> goto chan_err;
> } else {
> - dev_dbg(port->dev, "%s: mapped %d@%p to %x\n", __func__,
> + dev_dbg(port->dev, "%s: mapped %d@%p to %pad\n", __func__,
> sg_dma_len(&atmel_port->sg_tx),
> port->state->xmit.buf,
> - sg_dma_address(&atmel_port->sg_tx));
> + &sg_dma_address(&atmel_port->sg_tx));
> }
>
> /* Configure the slave DMA */
> @@ -1103,7 +1103,7 @@ static int atmel_prepare_rx_dma(struct uart_port *port)
> sg_set_page(&atmel_port->sg_rx,
> virt_to_page(ring->buf),
> sizeof(struct atmel_uart_char) * ATMEL_SERIAL_RINGSIZE,
> - (int)ring->buf & ~PAGE_MASK);
> + (unsigned long)ring->buf & ~PAGE_MASK);
> nent = dma_map_sg(port->dev,
> &atmel_port->sg_rx,
> 1,
> @@ -1113,10 +1113,10 @@ static int atmel_prepare_rx_dma(struct uart_port *port)
> dev_dbg(port->dev, "need to release resource of dma\n");
> goto chan_err;
> } else {
> - dev_dbg(port->dev, "%s: mapped %d@%p to %x\n", __func__,
> + dev_dbg(port->dev, "%s: mapped %d@%p to %pad\n", __func__,
> sg_dma_len(&atmel_port->sg_rx),
> ring->buf,
> - sg_dma_address(&atmel_port->sg_rx));
> + &sg_dma_address(&atmel_port->sg_rx));
> }
>
> /* Configure the slave DMA */
>
--
Nicolas Ferre
--
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
