Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b0c1bdf authored by Jon Hunter's avatar Jon Hunter Committed by Greg Kroah-Hartman
Browse files

serial: tegra: Use unsigned types for RX and TX byte counts 



The function tty_insert_flip_string() takes an argument "size" which is
of type size_t. This is an unsigned type. Update the count,
rx_bytes_requested and tx_bytes_requested in the tegra serial driver to
be unsigned integers so that an unsigned type is passed to
tty_insert_flip_string().

Signed-off-by: default avatarJon Hunter <jonathanh@nvidia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 853a6997

drivers/tty/serial/serial-tegra.c

+8 −7
Original line number Original line Diff line number Diff line
@@ -131,8 +131,8 @@ struct tegra_uart_port { 
	struct dma_async_tx_descriptor		*rx_dma_desc;

	struct dma_async_tx_descriptor		*rx_dma_desc;

	dma_cookie_t				tx_cookie;

	dma_cookie_t				tx_cookie;

	dma_cookie_t				rx_cookie;

	dma_cookie_t				rx_cookie;

	int					tx_bytes_requested;

	unsigned int				tx_bytes_requested;

	int					rx_bytes_requested;

	unsigned int				rx_bytes_requested;

};

};





static void tegra_uart_start_next_tx(struct tegra_uart_port *tup);

static void tegra_uart_start_next_tx(struct tegra_uart_port *tup);
@@ -408,7 +408,7 @@ static void tegra_uart_tx_dma_complete(void *args) 
	struct circ_buf *xmit = &tup->uport.state->xmit;

	struct circ_buf *xmit = &tup->uport.state->xmit;

	struct dma_tx_state state;

	struct dma_tx_state state;

	unsigned long flags;

	unsigned long flags;

	int count;

	unsigned int count;





	dmaengine_tx_status(tup->tx_dma_chan, tup->rx_cookie, &state);

	dmaengine_tx_status(tup->tx_dma_chan, tup->rx_cookie, &state);

	count = tup->tx_bytes_requested - state.residue;

	count = tup->tx_bytes_requested - state.residue;
@@ -500,7 +500,7 @@ static void tegra_uart_stop_tx(struct uart_port *u) 
	struct tegra_uart_port *tup = to_tegra_uport(u);

	struct tegra_uart_port *tup = to_tegra_uport(u);

	struct circ_buf *xmit = &tup->uport.state->xmit;

	struct circ_buf *xmit = &tup->uport.state->xmit;

	struct dma_tx_state state;

	struct dma_tx_state state;

	int count;

	unsigned int count;





	if (tup->tx_in_progress != TEGRA_UART_TX_DMA)

	if (tup->tx_in_progress != TEGRA_UART_TX_DMA)

		return;

		return;
@@ -550,7 +550,8 @@ static void tegra_uart_handle_rx_pio(struct tegra_uart_port *tup, 
}

}





static void tegra_uart_copy_rx_to_tty(struct tegra_uart_port *tup,

static void tegra_uart_copy_rx_to_tty(struct tegra_uart_port *tup,

		struct tty_port *tty, int count)

				      struct tty_port *tty,

				      unsigned int count)

{

{

	int copied;

	int copied;
@@ -579,7 +580,7 @@ static void tegra_uart_rx_dma_complete(void *args) 
{

{

	struct tegra_uart_port *tup = args;

	struct tegra_uart_port *tup = args;

	struct uart_port *u = &tup->uport;

	struct uart_port *u = &tup->uport;

	int count = tup->rx_bytes_requested;

	unsigned int count = tup->rx_bytes_requested;

	struct tty_struct *tty = tty_port_tty_get(&tup->uport.state->port);

	struct tty_struct *tty = tty_port_tty_get(&tup->uport.state->port);

	struct tty_port *port = &u->state->port;

	struct tty_port *port = &u->state->port;

	unsigned long flags;

	unsigned long flags;
@@ -628,7 +629,7 @@ static void tegra_uart_handle_rx_dma(struct tegra_uart_port *tup, 
	struct tty_struct *tty = tty_port_tty_get(&tup->uport.state->port);

	struct tty_struct *tty = tty_port_tty_get(&tup->uport.state->port);

	struct tty_port *port = &tup->uport.state->port;

	struct tty_port *port = &tup->uport.state->port;

	struct uart_port *u = &tup->uport;

	struct uart_port *u = &tup->uport;

	int count;

	unsigned int count;





	/* Deactivate flow control to stop sender */

	/* Deactivate flow control to stop sender */

	if (tup->rts_active)

	if (tup->rts_active)