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

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / infiniband / hw / ehca / ehca_main.c

diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index 2f51c13d2f4929011748f33c8eba5b088aca12b1..c6cd38c5321fb2a11c553bd7754a9dad88b58a44 100644 (file)
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -418,7 +418,7 @@ int ehca_init_device(struct ehca_shca *shca)
        shca->ib_device.node_type           = RDMA_NODE_IB_CA;
        shca->ib_device.phys_port_cnt       = shca->num_ports;
        shca->ib_device.num_comp_vectors    = 1;
-       shca->ib_device.dma_device          = &shca->ibmebus_dev->ofdev.dev;
+       shca->ib_device.dma_device          = &shca->ofdev->dev;
        shca->ib_device.query_device        = ehca_query_device;
        shca->ib_device.query_port          = ehca_query_port;
        shca->ib_device.query_gid           = ehca_query_gid;
@@ -593,12 +593,12 @@ static ssize_t  ehca_show_##name(struct device *dev,                       \
                                                                           \
        rblock = ehca_alloc_fw_ctrlblock(GFP_KERNEL);                      \
        if (!rblock) {                                                     \
-               dev_err(dev, "Can't allocate rblock memory.");             \
+               dev_err(dev, "Can't allocate rblock memory.\n");           \
                return 0;                                                  \
        }                                                                  \
                                                                           \
        if (hipz_h_query_hca(shca->ipz_hca_handle, rblock) != H_SUCCESS) { \
-               dev_err(dev, "Can't query device properties");             \
+               dev_err(dev, "Can't query device properties\n");           \
                ehca_free_fw_ctrlblock(rblock);                            \
                return 0;                                                  \
        }                                                                  \
@@ -672,7 +672,7 @@ static struct attribute_group ehca_dev_attr_grp = {
        .attrs = ehca_dev_attrs
 };
 
-static int __devinit ehca_probe(struct ibmebus_dev *dev,
+static int __devinit ehca_probe(struct of_device *dev,
                                const struct of_device_id *id)
 {
        struct ehca_shca *shca;
@@ -680,16 +680,16 @@ static int __devinit ehca_probe(struct ibmebus_dev *dev,
        struct ib_pd *ibpd;
        int ret;
 
-       handle = of_get_property(dev->ofdev.node, "ibm,hca-handle", NULL);
+       handle = of_get_property(dev->node, "ibm,hca-handle", NULL);
        if (!handle) {
                ehca_gen_err("Cannot get eHCA handle for adapter: %s.",
-                            dev->ofdev.node->full_name);
+                            dev->node->full_name);
                return -ENODEV;
        }
 
        if (!(*handle)) {
                ehca_gen_err("Wrong eHCA handle for adapter: %s.",
-                            dev->ofdev.node->full_name);
+                            dev->node->full_name);
                return -ENODEV;
        }
 
@@ -700,9 +700,9 @@ static int __devinit ehca_probe(struct ibmebus_dev *dev,
        }
        mutex_init(&shca->modify_mutex);
 
-       shca->ibmebus_dev = dev;
+       shca->ofdev = dev;
        shca->ipz_hca_handle.handle = *handle;
-       dev->ofdev.dev.driver_data = shca;
+       dev->dev.driver_data = shca;
 
        ret = ehca_sense_attributes(shca);
        if (ret < 0) {
@@ -778,7 +778,7 @@ static int __devinit ehca_probe(struct ibmebus_dev *dev,
                }
        }
 
-       ret = sysfs_create_group(&dev->ofdev.dev.kobj, &ehca_dev_attr_grp);
+       ret = sysfs_create_group(&dev->dev.kobj, &ehca_dev_attr_grp);
        if (ret) /* only complain; we can live without attributes */
                ehca_err(&shca->ib_device,
                         "Cannot create device attributes  ret=%d", ret);
@@ -828,12 +828,12 @@ probe1:
        return -EINVAL;
 }
 
-static int __devexit ehca_remove(struct ibmebus_dev *dev)
+static int __devexit ehca_remove(struct of_device *dev)
 {
-       struct ehca_shca *shca = dev->ofdev.dev.driver_data;
+       struct ehca_shca *shca = dev->dev.driver_data;
        int ret;
 
-       sysfs_remove_group(&dev->ofdev.dev.kobj, &ehca_dev_attr_grp);
+       sysfs_remove_group(&dev->dev.kobj, &ehca_dev_attr_grp);
 
        if (ehca_open_aqp1 == 1) {
                int i;
@@ -884,11 +884,11 @@ static struct of_device_id ehca_device_table[] =
        {},
 };
 
-static struct ibmebus_driver ehca_driver = {
-       .name     = "ehca",
-       .id_table = ehca_device_table,
-       .probe    = ehca_probe,
-       .remove   = ehca_remove,
+static struct of_platform_driver ehca_driver = {
+       .name        = "ehca",
+       .match_table = ehca_device_table,
+       .probe       = ehca_probe,
+       .remove      = ehca_remove,
 };
 
 void ehca_poll_eqs(unsigned long data)