of: Remove duplicate fields from of_platform_driver

[linux-2.6-block.git] / drivers / serial / apbuart.c

diff --git a/drivers/serial/apbuart.c b/drivers/serial/apbuart.c
index fe91319b5f65b30a15c5b89baea504c27871b6e6..0099b8692b60c7b2f23781b32a530702e56457d7 100644 (file)
--- a/drivers/serial/apbuart.c
+++ b/drivers/serial/apbuart.c
@@ -559,7 +559,7 @@ static int __devinit apbuart_probe(struct of_device *op,
 
        i = 0;
        for (i = 0; i < grlib_apbuart_port_nr; i++) {
-               if (op->node == grlib_apbuart_nodes[i])
+               if (op->dev.of_node == grlib_apbuart_nodes[i])
                        break;
        }
 
@@ -584,12 +584,12 @@ static struct of_device_id __initdata apbuart_match[] = {
 };
 
 static struct of_platform_driver grlib_apbuart_of_driver = {
-       .match_table = apbuart_match,
        .probe = apbuart_probe,
        .driver = {
-                  .owner = THIS_MODULE,
-                  .name = "grlib-apbuart",
-                  },
+               .owner = THIS_MODULE,
+               .name = "grlib-apbuart",
+               .of_match_table = apbuart_match,
+       },
 };