Merge branch 'uverbs_dev_cleanups' into rdma.git for-next

For dependencies, branch based on rdma.git 'for-rc' of
https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git/

Pull 'uverbs_dev_cleanups' from Leon Romanovsky:

====================
Reuse the char device code interfaces to simplify ib_uverbs_device
creation and destruction. As part of this series, we are sending fix to
cleanup path, which was discovered during internal review,

The fix definitely can go to -rc, but it means that this series will be
dependent on rdma-rc.
====================

* branch 'uverbs_dev_cleanups':
  RDMA/uverbs: Use device.groups to initialize device attributes
  RDMA/uverbs: Use cdev_device_add() instead of cdev_add()
  RDMA/core: Depend on device_add() to add device attributes
  RDMA/uverbs: Fix error cleanup path of ib_uverbs_add_one()

Resolved conflict in ib_device_unregister_sysfs()

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

1 files changed, 27 insertions, 34 deletions

diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index 62351b3fcafc..0b04dbff884f 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -1183,7 +1183,7 @@ err_put:
         return ret;
 }
 
-static ssize_t show_node_type(struct device *device,
+static ssize_t node_type_show(struct device *device,
                               struct device_attribute *attr, char *buf)
 {
         struct ib_device *dev = container_of(device, struct ib_device, dev);
@@ -1198,8 +1198,9 @@ static ssize_t show_node_type(struct device *device,
         default:                  return sprintf(buf, "%d: <unknown>\n", dev->node_type);
         }
 }
+static DEVICE_ATTR_RO(node_type);
 
-static ssize_t show_sys_image_guid(struct device *device,
+static ssize_t sys_image_guid_show(struct device *device,
                                    struct device_attribute *dev_attr, char *buf)
 {
         struct ib_device *dev = container_of(device, struct ib_device, dev);
@@ -1210,8 +1211,9 @@ static ssize_t show_sys_image_guid(struct device *device,
                        be16_to_cpu(((__be16 *) &dev->attrs.sys_image_guid)[2]),
                        be16_to_cpu(((__be16 *) &dev->attrs.sys_image_guid)[3]));
 }
+static DEVICE_ATTR_RO(sys_image_guid);
 
-static ssize_t show_node_guid(struct device *device,
+static ssize_t node_guid_show(struct device *device,
                               struct device_attribute *attr, char *buf)
 {
         struct ib_device *dev = container_of(device, struct ib_device, dev);
@@ -1222,8 +1224,9 @@ static ssize_t show_node_guid(struct device *device,
                        be16_to_cpu(((__be16 *) &dev->node_guid)[2]),
                        be16_to_cpu(((__be16 *) &dev->node_guid)[3]));
 }
+static DEVICE_ATTR_RO(node_guid);
 
-static ssize_t show_node_desc(struct device *device,
+static ssize_t node_desc_show(struct device *device,
                               struct device_attribute *attr, char *buf)
 {
         struct ib_device *dev = container_of(device, struct ib_device, dev);
@@ -1231,9 +1234,9 @@ static ssize_t show_node_desc(struct device *device,
         return sprintf(buf, "%.64s\n", dev->node_desc);
 }
 
-static ssize_t set_node_desc(struct device *device,
-                             struct device_attribute *attr,
-                             const char *buf, size_t count)
+static ssize_t node_desc_store(struct device *device,
+                               struct device_attribute *attr,
+                               const char *buf, size_t count)
 {
         struct ib_device *dev = container_of(device, struct ib_device, dev);
         struct ib_device_modify desc = {};
@@ -1249,8 +1252,9 @@ static ssize_t set_node_desc(struct device *device,
 
         return count;
 }
+static DEVICE_ATTR_RW(node_desc);
 
-static ssize_t show_fw_ver(struct device *device, struct device_attribute *attr,
+static ssize_t fw_ver_show(struct device *device, struct device_attribute *attr,
                            char *buf)
 {
         struct ib_device *dev = container_of(device, struct ib_device, dev);
@@ -1259,19 +1263,19 @@ static ssize_t show_fw_ver(struct device *device, struct device_attribute *attr,
         strlcat(buf, "\n", IB_FW_VERSION_NAME_MAX);
         return strlen(buf);
 }
+static DEVICE_ATTR_RO(fw_ver);
+
+static struct attribute *ib_dev_attrs[] = {
+        &dev_attr_node_type.attr,
+        &dev_attr_node_guid.attr,
+        &dev_attr_sys_image_guid.attr,
+        &dev_attr_fw_ver.attr,
+        &dev_attr_node_desc.attr,
+        NULL,
+};
 
-static DEVICE_ATTR(node_type, S_IRUGO, show_node_type, NULL);
-static DEVICE_ATTR(sys_image_guid, S_IRUGO, show_sys_image_guid, NULL);
-static DEVICE_ATTR(node_guid, S_IRUGO, show_node_guid, NULL);
-static DEVICE_ATTR(node_desc, S_IRUGO | S_IWUSR, show_node_desc, set_node_desc);
-static DEVICE_ATTR(fw_ver, S_IRUGO, show_fw_ver, NULL);
-
-static struct device_attribute *ib_class_attributes[] = {
-        &dev_attr_node_type,
-        &dev_attr_sys_image_guid,
-        &dev_attr_node_guid,
-        &dev_attr_node_desc,
-        &dev_attr_fw_ver,
+static const struct attribute_group dev_attr_group = {
+        .attrs = ib_dev_attrs,
 };
 
 static void free_port_list_attributes(struct ib_device *device)
@@ -1311,16 +1315,13 @@ int ib_device_register_sysfs(struct ib_device *device,
         if (ret)
                 return ret;
 
+        device->groups[0] = &dev_attr_group;
+        class_dev->groups = device->groups;
+
         ret = device_add(class_dev);
         if (ret)
                 goto err;
 
-        for (i = 0; i < ARRAY_SIZE(ib_class_attributes); ++i) {
-                ret = device_create_file(class_dev, ib_class_attributes[i]);
-                if (ret)
-                        goto err_unregister;
-        }
-
         device->ports_parent = kobject_create_and_add("ports",
                                                       &class_dev->kobj);
         if (!device->ports_parent) {
@@ -1347,18 +1348,13 @@ int ib_device_register_sysfs(struct ib_device *device,
 
 err_put:
         free_port_list_attributes(device);
-
-err_unregister:
         device_del(class_dev);
-
 err:
         return ret;
 }
 
 void ib_device_unregister_sysfs(struct ib_device *device)
 {
-        int i;
-
         /* Hold device until ib_dealloc_device() */
         get_device(&device->dev);
 
@@ -1369,8 +1365,5 @@ void ib_device_unregister_sysfs(struct ib_device *device)
                 free_hsag(&device->dev.kobj, device->hw_stats_ag);
         }
 
-        for (i = 0; i < ARRAY_SIZE(ib_class_attributes); ++i)
-                device_remove_file(&device->dev, ib_class_attributes[i]);
-
         device_unregister(&device->dev);
 }