Merge branch 'for-6.9/amd-sfh' into for-linus

[sfrench/cifs-2.6.git] / drivers / tty / serial / rda-uart.c

diff --git a/drivers/tty/serial/rda-uart.c b/drivers/tty/serial/rda-uart.c
index d824c8318f3307a94735b76a71d04e9216ff816a..13deb355cf1bc36509a3c8676bb3aa8eaa11f437 100644 (file)
--- a/drivers/tty/serial/rda-uart.c
+++ b/drivers/tty/serial/rda-uart.c
@@ -780,19 +780,17 @@ static int rda_uart_probe(struct platform_device *pdev)
        return ret;
 }
 
-static int rda_uart_remove(struct platform_device *pdev)
+static void rda_uart_remove(struct platform_device *pdev)
 {
        struct rda_uart_port *rda_port = platform_get_drvdata(pdev);
 
        uart_remove_one_port(&rda_uart_driver, &rda_port->port);
        rda_uart_ports[pdev->id] = NULL;
-
-       return 0;
 }
 
 static struct platform_driver rda_uart_platform_driver = {
        .probe = rda_uart_probe,
-       .remove = rda_uart_remove,
+       .remove_new = rda_uart_remove,
        .driver = {
                .name = "rda-uart",
                .of_match_table = rda_uart_dt_matches,