Merge branch 'master' into for-next

2 files changed, 12 insertions, 10 deletions

diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c
index 07cae552cafb..e571e60ecb88 100644
--- a/drivers/infiniband/hw/ehca/ehca_irq.c
+++ b/drivers/infiniband/hw/ehca/ehca_irq.c
@@ -847,7 +847,7 @@ static int __cpuinit comp_pool_callback(struct notifier_block *nfb,
                 ehca_gen_dbg("CPU: %x (CPU_PREPARE)", cpu);
                 if (!create_comp_task(pool, cpu)) {
                         ehca_gen_err("Can't create comp_task for cpu: %x", cpu);
-                        return NOTIFY_BAD;
+                        return notifier_from_errno(-ENOMEM);
                 }
                 break;
         case CPU_UP_CANCELED:
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index 129a6bebd6e3..ecb51b396c42 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -291,8 +291,9 @@ static int ehca_sense_attributes(struct ehca_shca *shca)
         };
 
         ehca_gen_dbg("Probing adapter %s...",
-                     shca->ofdev->node->full_name);
-        loc_code = of_get_property(shca->ofdev->node, "ibm,loc-code", NULL);
+                     shca->ofdev->dev.of_node->full_name);
+        loc_code = of_get_property(shca->ofdev->dev.of_node, "ibm,loc-code",
+                                   NULL);
         if (loc_code)
                 ehca_gen_dbg(" ... location lode=%s", loc_code);
 
@@ -720,16 +721,16 @@ static int __devinit ehca_probe(struct of_device *dev,
         int ret, i, eq_size;
         unsigned long flags;
 
-        handle = of_get_property(dev->node, "ibm,hca-handle", NULL);
+        handle = of_get_property(dev->dev.of_node, "ibm,hca-handle", NULL);
         if (!handle) {
                 ehca_gen_err("Cannot get eHCA handle for adapter: %s.",
-                             dev->node->full_name);
+                             dev->dev.of_node->full_name);
                 return -ENODEV;
         }
 
         if (!(*handle)) {
                 ehca_gen_err("Wrong eHCA handle for adapter: %s.",
-                             dev->node->full_name);
+                             dev->dev.of_node->full_name);
                 return -ENODEV;
         }
 
@@ -798,7 +799,7 @@ static int __devinit ehca_probe(struct of_device *dev,
                 goto probe5;
         }
 
-        ret = ib_register_device(&shca->ib_device);
+        ret = ib_register_device(&shca->ib_device, NULL);
         if (ret) {
                 ehca_err(&shca->ib_device,
                          "ib_register_device() failed ret=%i", ret);
@@ -936,12 +937,13 @@ static struct of_device_id ehca_device_table[] =
 MODULE_DEVICE_TABLE(of, ehca_device_table);
 
 static struct of_platform_driver ehca_driver = {
-        .name        = "ehca",
-        .match_table = ehca_device_table,
         .probe       = ehca_probe,
         .remove      = ehca_remove,
-        .driver      = {
+        .driver = {
+                .name = "ehca",
+                .owner = THIS_MODULE,
                 .groups = ehca_drv_attr_groups,
+                .of_match_table = ehca_device_table,
         },
 };