mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Konrad Dybcio <konrad.dybcio@linaro.org>
To: Bartosz Golaszewski <brgl@bgdev.pl>,
	Andy Gross <agross@kernel.org>,
	Bjorn Andersson <andersson@kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Jiri Slaby <jirislaby@kernel.org>,
	Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
	Vinod Koul <vkoul@kernel.org>, Alex Elder <elder@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
	linux-serial@vger.kernel.org,
	Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Subject: Re: [PATCH 01/15] tty: serial: qcom-geni-serial: drop unneeded forward definitions
Date: Fri, 18 Nov 2022 14:15:50 +0100	[thread overview]
Message-ID: <129d2b3b-1cca-5737-efd9-629cbee341f9@linaro.org> (raw)
In-Reply-To: <20221118122539.384993-2-brgl@bgdev.pl>



On 18/11/2022 13:25, Bartosz Golaszewski wrote:
> From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
> 
> If we shuffle the code a bit, we can drop all forward definitions of
> various static functions.
> 
> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>   drivers/tty/serial/qcom_geni_serial.c | 79 +++++++++++++--------------
>   1 file changed, 37 insertions(+), 42 deletions(-)
> 
> diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
> index 83b66b73303a..9f2212e7b5ec 100644
> --- a/drivers/tty/serial/qcom_geni_serial.c
> +++ b/drivers/tty/serial/qcom_geni_serial.c
> @@ -147,11 +147,6 @@ static const struct uart_ops qcom_geni_console_pops;
>   static const struct uart_ops qcom_geni_uart_pops;
>   static struct uart_driver qcom_geni_console_driver;
>   static struct uart_driver qcom_geni_uart_driver;
> -static int handle_rx_console(struct uart_port *uport, u32 bytes, bool drop);
> -static int handle_rx_uart(struct uart_port *uport, u32 bytes, bool drop);
> -static unsigned int qcom_geni_serial_tx_empty(struct uart_port *port);
> -static void qcom_geni_serial_stop_rx(struct uart_port *uport);
> -static void qcom_geni_serial_handle_rx(struct uart_port *uport, bool drop);
>   
>   #define to_dev_port(ptr, member) \
>   		container_of(ptr, struct qcom_geni_serial_port, member)
> @@ -590,6 +585,11 @@ static int handle_rx_uart(struct uart_port *uport, u32 bytes, bool drop)
>   	return ret;
>   }
>   
> +static unsigned int qcom_geni_serial_tx_empty(struct uart_port *uport)
> +{
> +	return !readl(uport->membase + SE_GENI_TX_FIFO_STATUS);
> +}
> +
>   static void qcom_geni_serial_start_tx(struct uart_port *uport)
>   {
>   	u32 irq_en;
> @@ -635,25 +635,29 @@ static void qcom_geni_serial_stop_tx(struct uart_port *uport)
>   	writel(M_CMD_CANCEL_EN, uport->membase + SE_GENI_M_IRQ_CLEAR);
>   }
>   
> -static void qcom_geni_serial_start_rx(struct uart_port *uport)
> +static void qcom_geni_serial_handle_rx(struct uart_port *uport, bool drop)
>   {
> -	u32 irq_en;
>   	u32 status;
> +	u32 word_cnt;
> +	u32 last_word_byte_cnt;
> +	u32 last_word_partial;
> +	u32 total_bytes;
>   	struct qcom_geni_serial_port *port = to_dev_port(uport, uport);
>   
> -	status = readl(uport->membase + SE_GENI_STATUS);
> -	if (status & S_GENI_CMD_ACTIVE)
> -		qcom_geni_serial_stop_rx(uport);
> -
> -	geni_se_setup_s_cmd(&port->se, UART_START_READ, 0);
> -
> -	irq_en = readl(uport->membase + SE_GENI_S_IRQ_EN);
> -	irq_en |= S_RX_FIFO_WATERMARK_EN | S_RX_FIFO_LAST_EN;
> -	writel(irq_en, uport->membase + SE_GENI_S_IRQ_EN);
> +	status = readl(uport->membase +	SE_GENI_RX_FIFO_STATUS);
> +	word_cnt = status & RX_FIFO_WC_MSK;
> +	last_word_partial = status & RX_LAST;
> +	last_word_byte_cnt = (status & RX_LAST_BYTE_VALID_MSK) >>
> +						RX_LAST_BYTE_VALID_SHFT;
>   
> -	irq_en = readl(uport->membase + SE_GENI_M_IRQ_EN);
> -	irq_en |= M_RX_FIFO_WATERMARK_EN | M_RX_FIFO_LAST_EN;
> -	writel(irq_en, uport->membase + SE_GENI_M_IRQ_EN);
> +	if (!word_cnt)
> +		return;
> +	total_bytes = BYTES_PER_FIFO_WORD * (word_cnt - 1);
> +	if (last_word_partial && last_word_byte_cnt)
> +		total_bytes += last_word_byte_cnt;
> +	else
> +		total_bytes += BYTES_PER_FIFO_WORD;
> +	port->handle_rx(uport, total_bytes, drop);
>   }
>   
>   static void qcom_geni_serial_stop_rx(struct uart_port *uport)
> @@ -694,29 +698,25 @@ static void qcom_geni_serial_stop_rx(struct uart_port *uport)
>   		qcom_geni_serial_abort_rx(uport);
>   }
>   
> -static void qcom_geni_serial_handle_rx(struct uart_port *uport, bool drop)
> +static void qcom_geni_serial_start_rx(struct uart_port *uport)
>   {
> +	u32 irq_en;
>   	u32 status;
> -	u32 word_cnt;
> -	u32 last_word_byte_cnt;
> -	u32 last_word_partial;
> -	u32 total_bytes;
>   	struct qcom_geni_serial_port *port = to_dev_port(uport, uport);
>   
> -	status = readl(uport->membase +	SE_GENI_RX_FIFO_STATUS);
> -	word_cnt = status & RX_FIFO_WC_MSK;
> -	last_word_partial = status & RX_LAST;
> -	last_word_byte_cnt = (status & RX_LAST_BYTE_VALID_MSK) >>
> -						RX_LAST_BYTE_VALID_SHFT;
> +	status = readl(uport->membase + SE_GENI_STATUS);
> +	if (status & S_GENI_CMD_ACTIVE)
> +		qcom_geni_serial_stop_rx(uport);
>   
> -	if (!word_cnt)
> -		return;
> -	total_bytes = BYTES_PER_FIFO_WORD * (word_cnt - 1);
> -	if (last_word_partial && last_word_byte_cnt)
> -		total_bytes += last_word_byte_cnt;
> -	else
> -		total_bytes += BYTES_PER_FIFO_WORD;
> -	port->handle_rx(uport, total_bytes, drop);
> +	geni_se_setup_s_cmd(&port->se, UART_START_READ, 0);
> +
> +	irq_en = readl(uport->membase + SE_GENI_S_IRQ_EN);
> +	irq_en |= S_RX_FIFO_WATERMARK_EN | S_RX_FIFO_LAST_EN;
> +	writel(irq_en, uport->membase + SE_GENI_S_IRQ_EN);
> +
> +	irq_en = readl(uport->membase + SE_GENI_M_IRQ_EN);
> +	irq_en |= M_RX_FIFO_WATERMARK_EN | M_RX_FIFO_LAST_EN;
> +	writel(irq_en, uport->membase + SE_GENI_M_IRQ_EN);
>   }
>   
>   static void qcom_geni_serial_handle_tx(struct uart_port *uport, bool done,
> @@ -1122,11 +1122,6 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport,
>   	qcom_geni_serial_start_rx(uport);
>   }
>   
> -static unsigned int qcom_geni_serial_tx_empty(struct uart_port *uport)
> -{
> -	return !readl(uport->membase + SE_GENI_TX_FIFO_STATUS);
> -}
> -
>   #ifdef CONFIG_SERIAL_QCOM_GENI_CONSOLE
>   static int qcom_geni_console_setup(struct console *co, char *options)
>   {

  reply	other threads:[~2022-11-18 13:16 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-18 12:25 [PATCH 00/15] serial: qcom-geni-serial: implement support for SE DMA Bartosz Golaszewski
2022-11-18 12:25 ` [PATCH 01/15] tty: serial: qcom-geni-serial: drop unneeded forward definitions Bartosz Golaszewski
2022-11-18 13:15   ` Konrad Dybcio [this message]
2022-11-18 12:25 ` [PATCH 02/15] tty: serial: qcom-geni-serial: remove unused symbols Bartosz Golaszewski
2022-11-18 13:19   ` Konrad Dybcio
2022-11-18 12:25 ` [PATCH 03/15] tty: serial: qcom-geni-serial: align #define values Bartosz Golaszewski
2022-11-18 13:20   ` Konrad Dybcio
2022-11-18 12:25 ` [PATCH 04/15] tty: serial: qcom-geni-serial: simplify the to_dev_port() macro Bartosz Golaszewski
2022-11-18 13:22   ` Konrad Dybcio
2022-11-18 15:11   ` Ilpo Järvinen
2022-11-18 12:25 ` [PATCH 05/15] tty: serial: qcom-geni-serial: remove stray newlines Bartosz Golaszewski
2022-11-18 13:23   ` Konrad Dybcio
2022-11-18 12:25 ` [PATCH 06/15] tty: serial: qcom-geni-serial: refactor qcom_geni_serial_isr() Bartosz Golaszewski
2022-11-18 13:23   ` Konrad Dybcio
2022-11-18 15:12   ` Ilpo Järvinen
2022-11-18 12:25 ` [PATCH 07/15] tty: serial: qcom-geni-serial: remove unneeded tabs Bartosz Golaszewski
2022-11-18 13:25   ` Konrad Dybcio
2022-11-18 12:25 ` [PATCH 08/15] tty: serial: qcom-geni-serial: split out the FIFO tx code Bartosz Golaszewski
2022-11-18 13:27   ` Konrad Dybcio
2022-11-18 15:30   ` Ilpo Järvinen
2022-11-18 12:25 ` [PATCH 09/15] tty: serial: qcom-geni-serial: drop the return value from handle_rx Bartosz Golaszewski
2022-11-18 13:28   ` Konrad Dybcio
2022-11-18 12:25 ` [PATCH 10/15] tty: serial: qcom-geni-serial: use of_device_id data Bartosz Golaszewski
2022-11-18 13:31   ` Konrad Dybcio
2022-11-18 12:25 ` [PATCH 11/15] tty: serial: qcom-geni-serial: stop operations in progress at shutdown Bartosz Golaszewski
2022-11-18 13:31   ` Konrad Dybcio
2022-11-18 12:25 ` [PATCH 12/15] tty: serial: provide devm_uart_add_one_port() Bartosz Golaszewski
2022-11-18 12:25 ` [PATCH 13/15] tty: serial: qcom-geni-serial: use devres for uart port management Bartosz Golaszewski
2022-11-18 12:25 ` [PATCH 14/15] soc: qcom-geni-se: add more symbol definitions Bartosz Golaszewski
2022-11-18 13:35   ` Konrad Dybcio
2022-11-18 12:25 ` [PATCH 15/15] tty: serial: qcom-geni-serial: add support for serial engine DMA Bartosz Golaszewski
2022-11-18 15:50   ` Ilpo Järvinen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=129d2b3b-1cca-5737-efd9-629cbee341f9@linaro.org \
    --to=konrad.dybcio@linaro.org \
    --cc=agross@kernel.org \
    --cc=andersson@kernel.org \
    --cc=bartosz.golaszewski@linaro.org \
    --cc=brgl@bgdev.pl \
    --cc=elder@kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=jirislaby@kernel.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    --cc=srinivas.kandagatla@linaro.org \
    --cc=vkoul@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®