RDMA/core: Introduce and use ib_setup_port_attrs()

Refactor code for device and port sysfs attributes for reuse.

While at it, rename counter part free function to ib_free_port_attrs.

Also attribute setup sequence is:
(a) port specific init.
(b) device stats alloc/init.

So for cleanup, follow reverse sequence:
(a) device stats dealloc
(b) port specific cleanup

Signed-off-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index e04f111fe406ccdcc87ca9a293afba92bed2f3e1..7e51b406e89aff4be406ccd72eafd7b573f51724 100644 (file)
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -1279,17 +1279,17 @@ static const struct attribute_group dev_attr_group = {
        .attrs = ib_dev_attrs,
 };
 
-static void free_port_list_attributes(struct ib_device *device)
+static void ib_free_port_attrs(struct ib_device *device)
 {
        struct kobject *p, *t;
 
        list_for_each_entry_safe(p, t, &device->port_list, entry) {
                struct ib_port *port = container_of(p, struct ib_port, kobj);
+
                list_del(&p->entry);
-               if (port->hw_stats) {
-                       kfree(port->hw_stats);
+               if (port->hw_stats_ag)
                        free_hsag(&port->kobj, port->hw_stats_ag);
-               }
+               kfree(port->hw_stats);
 
                if (port->pma_table)
                        sysfs_remove_group(p, port->pma_table);
@@ -1306,24 +1306,14 @@ static void free_port_list_attributes(struct ib_device *device)
        kobject_put(device->ports_kobj);
 }
 
-int ib_device_register_sysfs(struct ib_device *device)
+static int ib_setup_port_attrs(struct ib_device *device)
 {
-       struct device *class_dev = &device->dev;
        int ret;
        int i;
 
-       device->groups[0] = &dev_attr_group;
-       class_dev->groups = device->groups;
-
-       ret = device_add(class_dev);
-       if (ret)
-               goto err;
-
-       device->ports_kobj = kobject_create_and_add("ports", &class_dev->kobj);
-       if (!device->ports_kobj) {
-               ret = -ENOMEM;
-               goto err_put;
-       }
+       device->ports_kobj = kobject_create_and_add("ports", &device->dev.kobj);
+       if (!device->ports_kobj)
+               return -ENOMEM;
 
        if (rdma_cap_ib_switch(device)) {
                ret = add_port(device, 0);
@@ -1337,26 +1327,42 @@ int ib_device_register_sysfs(struct ib_device *device)
                }
        }
 
-       if (device->ops.alloc_hw_stats)
-               setup_hw_stats(device, NULL, 0);
-
        return 0;
 
 err_put:
-       free_port_list_attributes(device);
-       device_del(class_dev);
-err:
+       ib_free_port_attrs(device);
        return ret;
 }
 
-void ib_device_unregister_sysfs(struct ib_device *device)
+int ib_device_register_sysfs(struct ib_device *device)
 {
-       free_port_list_attributes(device);
+       int ret;
 
-       if (device->hw_stats) {
-               kfree(device->hw_stats);
-               free_hsag(&device->dev.kobj, device->hw_stats_ag);
+       device->groups[0] = &dev_attr_group;
+       device->dev.groups = device->groups;
+
+       ret = device_add(&device->dev);
+       if (ret)
+               return ret;
+
+       ret = ib_setup_port_attrs(device);
+       if (ret) {
+               device_del(&device->dev);
+               return ret;
        }
+       if (device->ops.alloc_hw_stats)
+               setup_hw_stats(device, NULL, 0);
+
+       return 0;
+}
+
+void ib_device_unregister_sysfs(struct ib_device *device)
+{
+       if (device->hw_stats_ag)
+               free_hsag(&device->dev.kobj, device->hw_stats_ag);
+       kfree(device->hw_stats);
+
+       ib_free_port_attrs(device);
        /* Balances with device_add */
        device_del(&device->dev);
 }