Provided the uart driver is available globally, there is no need to
store a pointer to it in struct cdns_uart. Instead, use the global
cdns_uart_uart_driver in the code directly.

Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
---
Cc: Michal Simek <michal.simek@amd.com>
Cc: linux-arm-kernel@lists.infradead.org
---
 drivers/tty/serial/xilinx_uartps.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index a66b44d21fba..c793fc74c26b 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -190,7 +190,6 @@ MODULE_PARM_DESC(rx_timeout, "Rx timeout, 1-255");
  * @port:		Pointer to the UART port
  * @uartclk:		Reference clock
  * @pclk:		APB clock
- * @cdns_uart_driver:	Pointer to UART driver
  * @baud:		Current baud rate
  * @clk_rate_change_nb:	Notifier block for clock changes
  * @quirks:		Flags for RXBS support.
@@ -204,7 +203,6 @@ struct cdns_uart {
 	struct uart_port	*port;
 	struct clk		*uartclk;
 	struct clk		*pclk;
-	struct uart_driver	*cdns_uart_driver;
 	unsigned int		baud;
 	struct notifier_block	clk_rate_change_nb;
 	u32			quirks;
@@ -1465,7 +1463,6 @@ static struct console cdns_uart_console = {
 static int cdns_uart_suspend(struct device *device)
 {
 	struct uart_port *port = dev_get_drvdata(device);
-	struct cdns_uart *cdns_uart = port->private_data;
 	int may_wake;
 
 	may_wake = device_may_wakeup(device);
@@ -1489,7 +1486,7 @@ static int cdns_uart_suspend(struct device *device)
 	 * Call the API provided in serial_core.c file which handles
 	 * the suspend.
 	 */
-	return uart_suspend_port(cdns_uart->cdns_uart_driver, port);
+	return uart_suspend_port(&cdns_uart_uart_driver, port);
 }
 
 /**
@@ -1550,7 +1547,7 @@ static int cdns_uart_resume(struct device *device)
 		uart_port_unlock_irqrestore(port, flags);
 	}
 
-	return uart_resume_port(cdns_uart->cdns_uart_driver, port);
+	return uart_resume_port(&cdns_uart_uart_driver, port);
 }
 #endif /* ! CONFIG_PM_SLEEP */
 static int __maybe_unused cdns_runtime_suspend(struct device *dev)
@@ -1686,8 +1683,6 @@ static int cdns_uart_probe(struct platform_device *pdev)
 		}
 	}
 
-	cdns_uart_data->cdns_uart_driver = &cdns_uart_uart_driver;
-
 	match = of_match_node(cdns_uart_of_match, pdev->dev.of_node);
 	if (match && match->data) {
 		const struct cdns_platform_data *data = match->data;
@@ -1862,7 +1857,7 @@ static int cdns_uart_probe(struct platform_device *pdev)
 	clk_disable_unprepare(cdns_uart_data->pclk);
 err_out_unregister_driver:
 	if (!instances)
-		uart_unregister_driver(cdns_uart_data->cdns_uart_driver);
+		uart_unregister_driver(&cdns_uart_uart_driver);
 	return rc;
 }
 
@@ -1880,7 +1875,7 @@ static void cdns_uart_remove(struct platform_device *pdev)
 	clk_notifier_unregister(cdns_uart_data->uartclk,
 			&cdns_uart_data->clk_rate_change_nb);
 #endif
-	uart_remove_one_port(cdns_uart_data->cdns_uart_driver, port);
+	uart_remove_one_port(&cdns_uart_uart_driver, port);
 	port->mapbase = 0;
 	clk_disable_unprepare(cdns_uart_data->uartclk);
 	clk_disable_unprepare(cdns_uart_data->pclk);
@@ -1896,7 +1891,7 @@ static void cdns_uart_remove(struct platform_device *pdev)
 	reset_control_assert(cdns_uart_data->rstc);
 
 	if (!--instances)
-		uart_unregister_driver(cdns_uart_data->cdns_uart_driver);
+		uart_unregister_driver(&cdns_uart_uart_driver);
 }
 
 static struct platform_driver cdns_uart_platform_driver = {
-- 
2.51.1

On 11/19/25 10:24, Jiri Slaby (SUSE) wrote:
> Provided the uart driver is available globally, there is no need to
> store a pointer to it in struct cdns_uart. Instead, use the global
> cdns_uart_uart_driver in the code directly.
> 
> Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
> ---
> Cc: Michal Simek <michal.simek@amd.com>
> Cc: linux-arm-kernel@lists.infradead.org
> ---
>   drivers/tty/serial/xilinx_uartps.c | 15 +++++----------
>   1 file changed, 5 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
> index a66b44d21fba..c793fc74c26b 100644
> --- a/drivers/tty/serial/xilinx_uartps.c
> +++ b/drivers/tty/serial/xilinx_uartps.c
> @@ -190,7 +190,6 @@ MODULE_PARM_DESC(rx_timeout, "Rx timeout, 1-255");
>    * @port:		Pointer to the UART port
>    * @uartclk:		Reference clock
>    * @pclk:		APB clock
> - * @cdns_uart_driver:	Pointer to UART driver
>    * @baud:		Current baud rate
>    * @clk_rate_change_nb:	Notifier block for clock changes
>    * @quirks:		Flags for RXBS support.
> @@ -204,7 +203,6 @@ struct cdns_uart {
>   	struct uart_port	*port;
>   	struct clk		*uartclk;
>   	struct clk		*pclk;
> -	struct uart_driver	*cdns_uart_driver;
>   	unsigned int		baud;
>   	struct notifier_block	clk_rate_change_nb;
>   	u32			quirks;
> @@ -1465,7 +1463,6 @@ static struct console cdns_uart_console = {
>   static int cdns_uart_suspend(struct device *device)
>   {
>   	struct uart_port *port = dev_get_drvdata(device);
> -	struct cdns_uart *cdns_uart = port->private_data;
>   	int may_wake;
>   
>   	may_wake = device_may_wakeup(device);
> @@ -1489,7 +1486,7 @@ static int cdns_uart_suspend(struct device *device)
>   	 * Call the API provided in serial_core.c file which handles
>   	 * the suspend.
>   	 */
> -	return uart_suspend_port(cdns_uart->cdns_uart_driver, port);
> +	return uart_suspend_port(&cdns_uart_uart_driver, port);
>   }
>   
>   /**
> @@ -1550,7 +1547,7 @@ static int cdns_uart_resume(struct device *device)
>   		uart_port_unlock_irqrestore(port, flags);
>   	}
>   
> -	return uart_resume_port(cdns_uart->cdns_uart_driver, port);
> +	return uart_resume_port(&cdns_uart_uart_driver, port);
>   }
>   #endif /* ! CONFIG_PM_SLEEP */
>   static int __maybe_unused cdns_runtime_suspend(struct device *dev)
> @@ -1686,8 +1683,6 @@ static int cdns_uart_probe(struct platform_device *pdev)
>   		}
>   	}
>   
> -	cdns_uart_data->cdns_uart_driver = &cdns_uart_uart_driver;
> -
>   	match = of_match_node(cdns_uart_of_match, pdev->dev.of_node);
>   	if (match && match->data) {
>   		const struct cdns_platform_data *data = match->data;
> @@ -1862,7 +1857,7 @@ static int cdns_uart_probe(struct platform_device *pdev)
>   	clk_disable_unprepare(cdns_uart_data->pclk);
>   err_out_unregister_driver:
>   	if (!instances)
> -		uart_unregister_driver(cdns_uart_data->cdns_uart_driver);
> +		uart_unregister_driver(&cdns_uart_uart_driver);
>   	return rc;
>   }
>   
> @@ -1880,7 +1875,7 @@ static void cdns_uart_remove(struct platform_device *pdev)
>   	clk_notifier_unregister(cdns_uart_data->uartclk,
>   			&cdns_uart_data->clk_rate_change_nb);
>   #endif
> -	uart_remove_one_port(cdns_uart_data->cdns_uart_driver, port);
> +	uart_remove_one_port(&cdns_uart_uart_driver, port);
>   	port->mapbase = 0;
>   	clk_disable_unprepare(cdns_uart_data->uartclk);
>   	clk_disable_unprepare(cdns_uart_data->pclk);
> @@ -1896,7 +1891,7 @@ static void cdns_uart_remove(struct platform_device *pdev)
>   	reset_control_assert(cdns_uart_data->rstc);
>   
>   	if (!--instances)
> -		uart_unregister_driver(cdns_uart_data->cdns_uart_driver);
> +		uart_unregister_driver(&cdns_uart_uart_driver);
>   }
>   
>   static struct platform_driver cdns_uart_platform_driver = {

Acked-by: Michal Simek <michal.simek@amd.com>

Thanks,
Michal