Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Sherry Sun <sherry.sun@nxp.com>
To:     gregkh@linuxfoundation.org, jirislaby@kernel.org
Cc:     linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-imx@nxp.com
Subject: [PATCH 1/2] tty: serial: fsl_lpuart: move the lpuart32_int() below
Date:   Mon, 10 Jul 2023 09:38:56 +0800
Message-Id: <20230710013857.7396-2-sherry.sun@nxp.com>
In-Reply-To: <20230710013857.7396-1-sherry.sun@nxp.com>
References: <20230710013857.7396-1-sherry.sun@nxp.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ajnihslwGnE1Rn7Hf+ARUcwq8dUXmUDg8C3qeG3lXmE7Js6wlX0Dn5dg4kwQ?=
 =?us-ascii?Q?HU7pY/fS7MJDSsZh50YN+JVEXmdD0mlyst/kFkH+ym4uPWkBcoydkUYewwnZ?=
 =?us-ascii?Q?BZkW9YbpWSRBOaDd3nIPJr1thgbosk2R4VS66bDgdWr1qALn2iFuySd8unGn?=
 =?us-ascii?Q?qDEassW/ahoFwW0jYABrFODMTlT4pxcEUbBoxG1kdQJj9QLPcEgQfASROcmJ?=
 =?us-ascii?Q?a0iOkDbu2qBCIANxSLNvleVBJaKVHqk0Bv/RK5kKTc0PolRDrFY6bDZgZph0?=
 =?us-ascii?Q?nq8aHDSqvffb8qXaK8ozXz6bgBgaDUgFhPaYaTqp93lcFRRad6zM5boa0nco?=
 =?us-ascii?Q?Q0Ype11ZYi8RDl2c8m1ytrjIHc/8bERRGI0f0dmTWfJvzX3aE0hsnXJskai8?=
 =?us-ascii?Q?U8rtAyQOKx5UXMXxEdoq6DdiWRzQNi0sNh1IUXgIDvSZhGlz6b5bj3Ie+tif?=
 =?us-ascii?Q?myOhPVRcu+iCvHtWuq2cqlGPJPjq3etEMrT2we+DFYD58JBLBj1e25Iz0ZDS?=
 =?us-ascii?Q?F+z+1NmoZ/Xy083F/9Zw7pkKnuhFGUm0SJdGuAcKlWMTMi2pL9YGMFK27S5q?=
 =?us-ascii?Q?JPwHpf6Vo9dtGRa9O6E5bToJZgAMBCpiHFPkPZzL3MjsM3/G78yhvFYQtxJO?=
 =?us-ascii?Q?GAc5UK7ojexI07t9I6K7RU1cWqMos3y+GfduVvlg7ul1E02IMEwatyiVEdQU?=
 =?us-ascii?Q?32LYhXe0b8xd3Nre6Skx/AsSai70f0XDfAm2AQfTEWsCWu0Va1F6+6xVr5H6?=
 =?us-ascii?Q?3vqIXyWp4dr6U7IVhkF5p7HCIewRdwBZc2MCa18+7U+qTvXE6Qk/hyIWRJGX?=
 =?us-ascii?Q?WTg8JZ/a/Q2n+tFpTgD0OYnFLz/4r44ujU6y4vLNDlSZ5KSlmdYgaOLj3g/S?=
 =?us-ascii?Q?YwAJZCwNNdXzCDV8XI9JvjwAMv999V086KnVDspS9ohggvdglWoc+K8mzbJB?=
 =?us-ascii?Q?yrZ7XzQLwGQiDXP3ddFUMZSabq245CE8GkYuwhWU/SIgrAAl/NXT0XmSei7R?=
 =?us-ascii?Q?GeCzlhWZcPCZdfIrqi8T3J0m8c7pSbSV2QA3xFWt/eUvXJdpcm+daEE2hwV8?=
 =?us-ascii?Q?4PffY59PR16Vs/BHe58z9ad6HcWPxdJh/KrDXD7cJDkb/uCRchEhvY4R0gvo?=
 =?us-ascii?Q?6etLU0reIuTJ3eLhjY3ESpolxq39mqkJmRwaw+k1dJx5ucf750oNpozqsVaE?=
 =?us-ascii?Q?LcXdpuw8bnoI+hsRlg9C7kVtmS2j9vlShRrUJf5T3IJvZV5L9QJ2TvvlLUTe?=
 =?us-ascii?Q?SDiJGaUinok+4IBj+q7NA0dYrBSJQfIw7AsHNzHsG+Rbe/jNmqW9J3exN3/x?=
 =?us-ascii?Q?sGuW4SgSzYfbNcSUTB1+fLw7ALdTjgRFSh/tl0234ZzJwwZNyrMVjxqyTUlf?=
 =?us-ascii?Q?/KxgpBJFJajUOAPPDFeELy3ElKz8z2tOlRsj0YXO+eQDRvJuPUOl3kHR8t38?=
 =?us-ascii?Q?TfASD4asZuGU9hbMrpo71OQscpWdLdtZ3dNHt1Ouv8pdfvYAd5xti9LJhfHp?=
 =?us-ascii?Q?I1hR48pofdB+CMftikS2kIXTa+/DkZTICgISS69hqSL9YqvNEFwa2li0ek7t?=
 =?us-ascii?Q?UrlUeePygiKmIwXS2fzuC2JuQ1XPoq8BRApdm+A5?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 12a92f9b-958a-413e-0170-08db80e69752
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8404.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2023 01:40:07.4210
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 0iI0PQyAM/VMToV2EGFNkIOQI0netzL7CUC2k/yIjeAk6ZvWNbHs2JbTIebh3Qe9ikUIZMLDemaUX0W9An+xOA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8117
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Move the lpuart32_int() below lpuart_copy_rx_to_tty(), this is a
preparation patch for the next patch to avoid the function declaration,
no actual functional changes.

Signed-off-by: Sherry Sun <sherry.sun@nxp.com>
---
 drivers/tty/serial/fsl_lpuart.c | 39 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index 6c652d77f566..653cf8eb5a72 100644
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -1066,26 +1066,6 @@ static irqreturn_t lpuart_int(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-static irqreturn_t lpuart32_int(int irq, void *dev_id)
-{
-	struct lpuart_port *sport = dev_id;
-	unsigned long sts, rxcount;
-
-	sts = lpuart32_read(&sport->port, UARTSTAT);
-	rxcount = lpuart32_read(&sport->port, UARTWATER);
-	rxcount = rxcount >> UARTWATER_RXCNT_OFF;
-
-	if ((sts & UARTSTAT_RDRF || rxcount > 0) && !sport->lpuart_dma_rx_use)
-		lpuart32_rxint(sport);
-
-	if ((sts & UARTSTAT_TDRE) && !sport->lpuart_dma_tx_use)
-		lpuart32_txint(sport);
-
-	lpuart32_write(&sport->port, sts, UARTSTAT);
-	return IRQ_HANDLED;
-}
-
-
 static inline void lpuart_handle_sysrq_chars(struct uart_port *port,
 					     unsigned char *p, int count)
 {
@@ -1278,6 +1258,25 @@ static void lpuart_dma_rx_complete(void *arg)
 	lpuart_copy_rx_to_tty(sport);
 }
 
+static irqreturn_t lpuart32_int(int irq, void *dev_id)
+{
+	struct lpuart_port *sport = dev_id;
+	unsigned long sts, rxcount;
+
+	sts = lpuart32_read(&sport->port, UARTSTAT);
+	rxcount = lpuart32_read(&sport->port, UARTWATER);
+	rxcount = rxcount >> UARTWATER_RXCNT_OFF;
+
+	if ((sts & UARTSTAT_RDRF || rxcount > 0) && !sport->lpuart_dma_rx_use)
+		lpuart32_rxint(sport);
+
+	if ((sts & UARTSTAT_TDRE) && !sport->lpuart_dma_tx_use)
+		lpuart32_txint(sport);
+
+	lpuart32_write(&sport->port, sts, UARTSTAT);
+	return IRQ_HANDLED;
+}
+
 /*
  * Timer function to simulate the hardware EOP (End Of Package) event.
  * The timer callback is to check for new RX data and copy to TTY buffer.
-- 
2.17.1