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

[sfrench/cifs-2.6.git] / drivers / tty / serial / 8250 / 8250_ioc3.c

diff --git a/drivers/tty/serial/8250/8250_ioc3.c b/drivers/tty/serial/8250/8250_ioc3.c
index d5a39e105a76f5bfbd9e3718c91d52ca5a79fbff..50c77c3dacf2c809dd1785e54a363c5381d605b9 100644 (file)
--- a/drivers/tty/serial/8250/8250_ioc3.c
+++ b/drivers/tty/serial/8250/8250_ioc3.c
@@ -75,17 +75,16 @@ static int serial8250_ioc3_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int serial8250_ioc3_remove(struct platform_device *pdev)
+static void serial8250_ioc3_remove(struct platform_device *pdev)
 {
        struct ioc3_8250_data *data = platform_get_drvdata(pdev);
 
        serial8250_unregister_port(data->line);
-       return 0;
 }
 
 static struct platform_driver serial8250_ioc3_driver = {
        .probe  = serial8250_ioc3_probe,
-       .remove = serial8250_ioc3_remove,
+       .remove_new = serial8250_ioc3_remove,
        .driver = {
                .name = "ioc3-serial8250",
        }