1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index 7261b8d9087c..ed8a9cec2a05 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -772,18 +772,18 @@ hwicap_of_probe(struct of_device *op, const struct of_device_id *match)
 
         dev_dbg(&op->dev, "hwicap_of_probe(%p, %p)\n", op, match);
 
-        rc = of_address_to_resource(op->node, 0, &res);
+        rc = of_address_to_resource(op->dev.of_node, 0, &res);
         if (rc) {
                 dev_err(&op->dev, "invalid address\n");
                 return rc;
         }
 
-        id = of_get_property(op->node, "port-number", NULL);
+        id = of_get_property(op->dev.of_node, "port-number", NULL);
 
         /* It's most likely that we're using V4, if the family is not
            specified */
         regs = &v4_config_registers;
-        family = of_get_property(op->node, "xlnx,family", NULL);
+        family = of_get_property(op->dev.of_node, "xlnx,family", NULL);
 
         if (family) {
                 if (!strcmp(family, "virtex2p")) {
@@ -812,13 +812,12 @@ static const struct of_device_id __devinitconst hwicap_of_match[] = {
 MODULE_DEVICE_TABLE(of, hwicap_of_match);
 
 static struct of_platform_driver hwicap_of_driver = {
-        .owner = THIS_MODULE,
-        .name = DRIVER_NAME,
-        .match_table = hwicap_of_match,
         .probe = hwicap_of_probe,
         .remove = __devexit_p(hwicap_of_remove),
         .driver = {
                 .name = DRIVER_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = hwicap_of_match,
         },
 };