Skip to content

Commit 6d4b55b

Browse files
Jiri Slaby (SUSE)gregkh
authored andcommitted
serial: xilinx_uartps: drop cdns_uart::cdns_uart_driver
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> Acked-by: Michal Simek <michal.simek@amd.com> Link: https://patch.msgid.link/20251119092457.826789-3-jirislaby@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 80a3471 commit 6d4b55b

1 file changed

Lines changed: 5 additions & 10 deletions

File tree

drivers/tty/serial/xilinx_uartps.c

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ MODULE_PARM_DESC(rx_timeout, "Rx timeout, 1-255");
190190
* @port: Pointer to the UART port
191191
* @uartclk: Reference clock
192192
* @pclk: APB clock
193-
* @cdns_uart_driver: Pointer to UART driver
194193
* @baud: Current baud rate
195194
* @clk_rate_change_nb: Notifier block for clock changes
196195
* @quirks: Flags for RXBS support.
@@ -204,7 +203,6 @@ struct cdns_uart {
204203
struct uart_port *port;
205204
struct clk *uartclk;
206205
struct clk *pclk;
207-
struct uart_driver *cdns_uart_driver;
208206
unsigned int baud;
209207
struct notifier_block clk_rate_change_nb;
210208
u32 quirks;
@@ -1465,7 +1463,6 @@ static struct console cdns_uart_console = {
14651463
static int cdns_uart_suspend(struct device *device)
14661464
{
14671465
struct uart_port *port = dev_get_drvdata(device);
1468-
struct cdns_uart *cdns_uart = port->private_data;
14691466
int may_wake;
14701467

14711468
may_wake = device_may_wakeup(device);
@@ -1489,7 +1486,7 @@ static int cdns_uart_suspend(struct device *device)
14891486
* Call the API provided in serial_core.c file which handles
14901487
* the suspend.
14911488
*/
1492-
return uart_suspend_port(cdns_uart->cdns_uart_driver, port);
1489+
return uart_suspend_port(&cdns_uart_uart_driver, port);
14931490
}
14941491

14951492
/**
@@ -1550,7 +1547,7 @@ static int cdns_uart_resume(struct device *device)
15501547
uart_port_unlock_irqrestore(port, flags);
15511548
}
15521549

1553-
return uart_resume_port(cdns_uart->cdns_uart_driver, port);
1550+
return uart_resume_port(&cdns_uart_uart_driver, port);
15541551
}
15551552
#endif /* ! CONFIG_PM_SLEEP */
15561553
static int __maybe_unused cdns_runtime_suspend(struct device *dev)
@@ -1686,8 +1683,6 @@ static int cdns_uart_probe(struct platform_device *pdev)
16861683
}
16871684
}
16881685

1689-
cdns_uart_data->cdns_uart_driver = &cdns_uart_uart_driver;
1690-
16911686
match = of_match_node(cdns_uart_of_match, pdev->dev.of_node);
16921687
if (match && match->data) {
16931688
const struct cdns_platform_data *data = match->data;
@@ -1862,7 +1857,7 @@ static int cdns_uart_probe(struct platform_device *pdev)
18621857
clk_disable_unprepare(cdns_uart_data->pclk);
18631858
err_out_unregister_driver:
18641859
if (!instances)
1865-
uart_unregister_driver(cdns_uart_data->cdns_uart_driver);
1860+
uart_unregister_driver(&cdns_uart_uart_driver);
18661861
return rc;
18671862
}
18681863

@@ -1880,7 +1875,7 @@ static void cdns_uart_remove(struct platform_device *pdev)
18801875
clk_notifier_unregister(cdns_uart_data->uartclk,
18811876
&cdns_uart_data->clk_rate_change_nb);
18821877
#endif
1883-
uart_remove_one_port(cdns_uart_data->cdns_uart_driver, port);
1878+
uart_remove_one_port(&cdns_uart_uart_driver, port);
18841879
port->mapbase = 0;
18851880
clk_disable_unprepare(cdns_uart_data->uartclk);
18861881
clk_disable_unprepare(cdns_uart_data->pclk);
@@ -1896,7 +1891,7 @@ static void cdns_uart_remove(struct platform_device *pdev)
18961891
reset_control_assert(cdns_uart_data->rstc);
18971892

18981893
if (!--instances)
1899-
uart_unregister_driver(cdns_uart_data->cdns_uart_driver);
1894+
uart_unregister_driver(&cdns_uart_uart_driver);
19001895
}
19011896

19021897
static struct platform_driver cdns_uart_platform_driver = {

0 commit comments

Comments
 (0)