1 files changed, 42 insertions, 52 deletions

diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index fe90e7454560..c3f99f33b49c 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -52,7 +52,7 @@
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Christoph Raisch <raisch@de.ibm.com>");
 MODULE_DESCRIPTION("IBM eServer HCA InfiniBand Device Driver");
-MODULE_VERSION("SVNEHCA_0022");
+MODULE_VERSION("SVNEHCA_0023");
 
 int ehca_open_aqp1     = 0;
 int ehca_debug_level   = 0;
@@ -62,7 +62,7 @@ int ehca_use_hp_mr     = 0;
 int ehca_port_act_time = 30;
 int ehca_poll_all_eqs  = 1;
 int ehca_static_rate   = -1;
-int ehca_scaling_code  = 1;
+int ehca_scaling_code  = 0;
 
 module_param_named(open_aqp1,     ehca_open_aqp1,     int, 0);
 module_param_named(debug_level,   ehca_debug_level,   int, 0);
@@ -98,6 +98,7 @@ MODULE_PARM_DESC(scaling_code,
 
 spinlock_t ehca_qp_idr_lock;
 spinlock_t ehca_cq_idr_lock;
+spinlock_t hcall_lock;
 DEFINE_IDR(ehca_qp_idr);
 DEFINE_IDR(ehca_cq_idr);
 
@@ -453,15 +454,14 @@ static ssize_t ehca_store_debug_level(struct device_driver *ddp,
 DRIVER_ATTR(debug_level, S_IRUSR | S_IWUSR,
             ehca_show_debug_level, ehca_store_debug_level);
 
-void ehca_create_driver_sysfs(struct ibmebus_driver *drv)
-{
-        driver_create_file(&drv->driver, &driver_attr_debug_level);
-}
+static struct attribute *ehca_drv_attrs[] = {
+        &driver_attr_debug_level.attr,
+        NULL
+};
 
-void ehca_remove_driver_sysfs(struct ibmebus_driver *drv)
-{
-        driver_remove_file(&drv->driver, &driver_attr_debug_level);
-}
+static struct attribute_group ehca_drv_attr_grp = {
+        .attrs = ehca_drv_attrs
+};
 
 #define EHCA_RESOURCE_ATTR(name)                                           \
 static ssize_t  ehca_show_##name(struct device *dev,                       \
@@ -523,44 +523,28 @@ static ssize_t ehca_show_adapter_handle(struct device *dev,
 }
 static DEVICE_ATTR(adapter_handle, S_IRUGO, ehca_show_adapter_handle, NULL);
 
+static struct attribute *ehca_dev_attrs[] = {
+        &dev_attr_adapter_handle.attr,
+        &dev_attr_num_ports.attr,
+        &dev_attr_hw_ver.attr,
+        &dev_attr_max_eq.attr,
+        &dev_attr_cur_eq.attr,
+        &dev_attr_max_cq.attr,
+        &dev_attr_cur_cq.attr,
+        &dev_attr_max_qp.attr,
+        &dev_attr_cur_qp.attr,
+        &dev_attr_max_mr.attr,
+        &dev_attr_cur_mr.attr,
+        &dev_attr_max_mw.attr,
+        &dev_attr_cur_mw.attr,
+        &dev_attr_max_pd.attr,
+        &dev_attr_max_ah.attr,
+        NULL
+};
 
-void ehca_create_device_sysfs(struct ibmebus_dev *dev)
-{
-        device_create_file(&dev->ofdev.dev, &dev_attr_adapter_handle);
-        device_create_file(&dev->ofdev.dev, &dev_attr_num_ports);
-        device_create_file(&dev->ofdev.dev, &dev_attr_hw_ver);
-        device_create_file(&dev->ofdev.dev, &dev_attr_max_eq);
-        device_create_file(&dev->ofdev.dev, &dev_attr_cur_eq);
-        device_create_file(&dev->ofdev.dev, &dev_attr_max_cq);
-        device_create_file(&dev->ofdev.dev, &dev_attr_cur_cq);
-        device_create_file(&dev->ofdev.dev, &dev_attr_max_qp);
-        device_create_file(&dev->ofdev.dev, &dev_attr_cur_qp);
-        device_create_file(&dev->ofdev.dev, &dev_attr_max_mr);
-        device_create_file(&dev->ofdev.dev, &dev_attr_cur_mr);
-        device_create_file(&dev->ofdev.dev, &dev_attr_max_mw);
-        device_create_file(&dev->ofdev.dev, &dev_attr_cur_mw);
-        device_create_file(&dev->ofdev.dev, &dev_attr_max_pd);
-        device_create_file(&dev->ofdev.dev, &dev_attr_max_ah);
-}
-
-void ehca_remove_device_sysfs(struct ibmebus_dev *dev)
-{
-        device_remove_file(&dev->ofdev.dev, &dev_attr_adapter_handle);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_num_ports);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_hw_ver);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_max_eq);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_cur_eq);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_max_cq);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_cur_cq);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_max_qp);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_cur_qp);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_max_mr);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_cur_mr);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_max_mw);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_cur_mw);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_max_pd);
-        device_remove_file(&dev->ofdev.dev, &dev_attr_max_ah);
-}
+static struct attribute_group ehca_dev_attr_grp = {
+        .attrs = ehca_dev_attrs
+};
 
 static int __devinit ehca_probe(struct ibmebus_dev *dev,
                                 const struct of_device_id *id)
@@ -668,7 +652,10 @@ static int __devinit ehca_probe(struct ibmebus_dev *dev,
                 }
         }
 
-        ehca_create_device_sysfs(dev);
+        ret = sysfs_create_group(&dev->ofdev.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);
 
         spin_lock(&shca_list_lock);
         list_add(&shca->shca_list, &shca_list);
@@ -720,7 +707,7 @@ static int __devexit ehca_remove(struct ibmebus_dev *dev)
         struct ehca_shca *shca = dev->ofdev.dev.driver_data;
         int ret;
 
-        ehca_remove_device_sysfs(dev);
+        sysfs_remove_group(&dev->ofdev.dev.kobj, &ehca_dev_attr_grp);
 
         if (ehca_open_aqp1 == 1) {
                 int i;
@@ -812,11 +799,12 @@ int __init ehca_module_init(void)
         int ret;
 
         printk(KERN_INFO "eHCA Infiniband Device Driver "
-               "(Rel.: SVNEHCA_0022)\n");
+               "(Rel.: SVNEHCA_0023)\n");
         idr_init(&ehca_qp_idr);
         idr_init(&ehca_cq_idr);
         spin_lock_init(&ehca_qp_idr_lock);
         spin_lock_init(&ehca_cq_idr_lock);
+        spin_lock_init(&hcall_lock);
 
         INIT_LIST_HEAD(&shca_list);
         spin_lock_init(&shca_list_lock);
@@ -838,7 +826,9 @@ int __init ehca_module_init(void)
                 goto module_init2;
         }
 
-        ehca_create_driver_sysfs(&ehca_driver);
+        ret = sysfs_create_group(&ehca_driver.driver.kobj, &ehca_drv_attr_grp);
+        if (ret) /* only complain; we can live without attributes */
+                ehca_gen_err("Cannot create driver attributes  ret=%d", ret);
 
         if (ehca_poll_all_eqs != 1) {
                 ehca_gen_err("WARNING!!!");
@@ -865,7 +855,7 @@ void __exit ehca_module_exit(void)
         if (ehca_poll_all_eqs == 1)
                 del_timer_sync(&poll_eqs_timer);
 
-        ehca_remove_driver_sysfs(&ehca_driver);
+        sysfs_remove_group(&ehca_driver.driver.kobj, &ehca_drv_attr_grp);
         ibmebus_unregister_driver(&ehca_driver);
 
         ehca_destroy_slab_caches();