Commit 0626afe5 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Greg Kroah-Hartman
Browse files

tty: serial: qcom-geni-serial: drop the return value from handle_rx 



The return value of the handle_rx() callback is never checked. Drop it.

Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20221229155030.418800-12-brgl@bgdev.pl


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bd795584

drivers/tty/serial/qcom_geni_serial.c

+6 −8
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ struct qcom_geni_serial_port { 
	u32 tx_fifo_width;

	u32 rx_fifo_depth;

	bool setup;

	int (*handle_rx)(struct uart_port *uport, u32 bytes, bool drop);

	void (*handle_rx)(struct uart_port *uport, u32 bytes, bool drop);

	unsigned int baud;

	void *rx_fifo;

	u32 loopback;
@@ -502,7 +502,7 @@ static void qcom_geni_serial_console_write(struct console *co, const char *s, 
		spin_unlock_irqrestore(&uport->lock, flags);

}



static int handle_rx_console(struct uart_port *uport, u32 bytes, bool drop)

static void handle_rx_console(struct uart_port *uport, u32 bytes, bool drop)

{

	u32 i;

	unsigned char buf[sizeof(u32)];
@@ -537,16 +537,15 @@ static int handle_rx_console(struct uart_port *uport, u32 bytes, bool drop) 
	}

	if (!drop)

		tty_flip_buffer_push(tport);

	return 0;

}

#else

static int handle_rx_console(struct uart_port *uport, u32 bytes, bool drop)

static void handle_rx_console(struct uart_port *uport, u32 bytes, bool drop)

{

	return -EPERM;



}

#endif /* CONFIG_SERIAL_QCOM_GENI_CONSOLE */



static int handle_rx_uart(struct uart_port *uport, u32 bytes, bool drop)

static void handle_rx_uart(struct uart_port *uport, u32 bytes, bool drop)

{

	struct tty_port *tport;

	struct qcom_geni_serial_port *port = to_dev_port(uport);
@@ -557,7 +556,7 @@ static int handle_rx_uart(struct uart_port *uport, u32 bytes, bool drop) 
	tport = &uport->state->port;

	ioread32_rep(uport->membase + SE_GENI_RX_FIFOn, port->rx_fifo, words);

	if (drop)

		return 0;

		return;



	ret = tty_insert_flip_string(tport, port->rx_fifo, bytes);

	if (ret != bytes) {
@@ -567,7 +566,6 @@ static int handle_rx_uart(struct uart_port *uport, u32 bytes, bool drop) 
	}

	uport->icount.rx += ret;

	tty_flip_buffer_push(tport);

	return ret;

}



static unsigned int qcom_geni_serial_tx_empty(struct uart_port *uport)