tty: remove use of __devinit

[deliverable/linux.git] / drivers / tty / serial / altera_jtaguart.c

diff --git a/drivers/tty/serial/altera_jtaguart.c b/drivers/tty/serial/altera_jtaguart.c
index 00a73ecb2dfb0654309a023a42b7a0f19720520a..ef5c705fa2b35e5b108edb56847ce12dd771516d 100644 (file)
--- a/drivers/tty/serial/altera_jtaguart.c
+++ b/drivers/tty/serial/altera_jtaguart.c
@@ -18,6 +18,7 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/console.h>
+#include <linux/of.h>
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
 #include <linux/serial.h>
@@ -405,7 +406,7 @@ static struct uart_driver altera_jtaguart_driver = {
        .cons           = ALTERA_JTAGUART_CONSOLE,
 };
 
-static int __devinit altera_jtaguart_probe(struct platform_device *pdev)
+static int altera_jtaguart_probe(struct platform_device *pdev)
 {
        struct altera_jtaguart_platform_uart *platp = pdev->dev.platform_data;
        struct uart_port *port;
@@ -472,17 +473,15 @@ static struct of_device_id altera_jtaguart_match[] = {
        {},
 };
 MODULE_DEVICE_TABLE(of, altera_jtaguart_match);
-#else
-#define altera_jtaguart_match NULL
 #endif /* CONFIG_OF */
 
 static struct platform_driver altera_jtaguart_platform_driver = {
        .probe  = altera_jtaguart_probe,
-       .remove = __devexit_p(altera_jtaguart_remove),
+       .remove = altera_jtaguart_remove,
        .driver = {
                .name           = DRV_NAME,
                .owner          = THIS_MODULE,
-               .of_match_table = altera_jtaguart_match,
+               .of_match_table = of_match_ptr(altera_jtaguart_match),
        },
 };