Skip to content

Commit

Permalink
serial: tegra: Use unsigned types for RX and TX byte counts
Browse files Browse the repository at this point in the history
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: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Jon Hunter authored and Greg Kroah-Hartman committed May 10, 2015
1 parent 853a699 commit 0b0c1bd
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions drivers/tty/serial/serial-tegra.c
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ struct tegra_uart_port {
struct dma_async_tx_descriptor *rx_dma_desc;
dma_cookie_t tx_cookie;
dma_cookie_t rx_cookie;
int tx_bytes_requested;
int rx_bytes_requested;
unsigned int tx_bytes_requested;
unsigned int rx_bytes_requested;
};

static void tegra_uart_start_next_tx(struct tegra_uart_port *tup);
Expand Down Expand Up @@ -408,7 +408,7 @@ static void tegra_uart_tx_dma_complete(void *args)
struct circ_buf *xmit = &tup->uport.state->xmit;
struct dma_tx_state state;
unsigned long flags;
int count;
unsigned int count;

dmaengine_tx_status(tup->tx_dma_chan, tup->rx_cookie, &state);
count = tup->tx_bytes_requested - state.residue;
Expand Down Expand Up @@ -500,7 +500,7 @@ static void tegra_uart_stop_tx(struct uart_port *u)
struct tegra_uart_port *tup = to_tegra_uport(u);
struct circ_buf *xmit = &tup->uport.state->xmit;
struct dma_tx_state state;
int count;
unsigned int count;

if (tup->tx_in_progress != TEGRA_UART_TX_DMA)
return;
Expand Down Expand Up @@ -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,
struct tty_port *tty, int count)
struct tty_port *tty,
unsigned int count)
{
int copied;

Expand Down Expand Up @@ -579,7 +580,7 @@ static void tegra_uart_rx_dma_complete(void *args)
{
struct tegra_uart_port *tup = args;
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_port *port = &u->state->port;
unsigned long flags;
Expand Down Expand Up @@ -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_port *port = &tup->uport.state->port;
struct uart_port *u = &tup->uport;
int count;
unsigned int count;

/* Deactivate flow control to stop sender */
if (tup->rts_active)
Expand Down

0 comments on commit 0b0c1bd

Please sign in to comment.