Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[firefly-linux-kernel-4.4.55.git] / drivers / tty / serial / sccnxp.c

diff --git a/drivers/tty/serial/sccnxp.c b/drivers/tty/serial/sccnxp.c
index e821068cd95b0f798dc7a9bb39d6507c6733812c..418b495e3233dc6c2dd7fb15a75af33d9568d9b5 100644 (file)
--- a/drivers/tty/serial/sccnxp.c
+++ b/drivers/tty/serial/sccnxp.c
@@ -740,7 +740,7 @@ static int sccnxp_console_setup(struct console *co, char *options)
 }
 #endif
 
-static int __devinit sccnxp_probe(struct platform_device *pdev)
+static int sccnxp_probe(struct platform_device *pdev)
 {
        struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        int chiptype = pdev->id_entry->driver_data;
@@ -943,7 +943,7 @@ err_out:
        return ret;
 }
 
-static int __devexit sccnxp_remove(struct platform_device *pdev)
+static int sccnxp_remove(struct platform_device *pdev)
 {
        int i;
        struct sccnxp_port *s = platform_get_drvdata(pdev);
@@ -981,7 +981,7 @@ static struct platform_driver sccnxp_uart_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = sccnxp_probe,
-       .remove         = __devexit_p(sccnxp_remove),
+       .remove         = sccnxp_remove,
        .id_table       = sccnxp_id_table,
 };
 module_platform_driver(sccnxp_uart_driver);