infiniband: hfi1: drop crazy DEBUGFS_SEQ_FILE_CREATE() macro

The macro was just making things harder to follow, and audit, so remove
it and call debugfs_create_file() directly.  Also, the macro did not
need to warn about the call failing as no one should ever care about any
debugfs functions failing.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/hw/hfi1/debugfs.c b/drivers/infiniband/hw/hfi1/debugfs.c
index 0a55779..aeb0f07 100644 (file)
--- a/drivers/infiniband/hw/hfi1/debugfs.c
+++ b/drivers/infiniband/hw/hfi1/debugfs.c
@@ -1167,6 +1167,7 @@ void hfi1_dbg_ibdev_init(struct hfi1_ibdev *ibd)
        char link[10];
        struct hfi1_devdata *dd = dd_from_dev(ibd);
        struct hfi1_pportdata *ppd;
+       struct dentry *root;
        int unit = dd->unit;
        int i, j;
 
@@ -1174,31 +1175,29 @@ void hfi1_dbg_ibdev_init(struct hfi1_ibdev *ibd)
                return;
        snprintf(name, sizeof(name), "%s_%d", class_name(), unit);
        snprintf(link, sizeof(link), "%d", unit);
-       ibd->hfi1_ibdev_dbg = debugfs_create_dir(name, hfi1_dbg_root);
-       if (!ibd->hfi1_ibdev_dbg) {
-               pr_warn("create of %s failed\n", name);
-               return;
-       }
+       root = debugfs_create_dir(name, hfi1_dbg_root);
+       ibd->hfi1_ibdev_dbg = root;
+
        ibd->hfi1_ibdev_link =
                debugfs_create_symlink(link, hfi1_dbg_root, name);
-       if (!ibd->hfi1_ibdev_link) {
-               pr_warn("create of %s symlink failed\n", name);
-               return;
-       }
-       DEBUGFS_SEQ_FILE_CREATE(opcode_stats, ibd->hfi1_ibdev_dbg, ibd);
-       DEBUGFS_SEQ_FILE_CREATE(tx_opcode_stats, ibd->hfi1_ibdev_dbg, ibd);
-       DEBUGFS_SEQ_FILE_CREATE(ctx_stats, ibd->hfi1_ibdev_dbg, ibd);
-       DEBUGFS_SEQ_FILE_CREATE(qp_stats, ibd->hfi1_ibdev_dbg, ibd);
-       DEBUGFS_SEQ_FILE_CREATE(sdes, ibd->hfi1_ibdev_dbg, ibd);
-       DEBUGFS_SEQ_FILE_CREATE(rcds, ibd->hfi1_ibdev_dbg, ibd);
-       DEBUGFS_SEQ_FILE_CREATE(pios, ibd->hfi1_ibdev_dbg, ibd);
-       DEBUGFS_SEQ_FILE_CREATE(sdma_cpu_list, ibd->hfi1_ibdev_dbg, ibd);
+
+       debugfs_create_file("opcode_stats", 0444, root, ibd,
+                           &_opcode_stats_file_ops);
+       debugfs_create_file("tx_opcode_stats", 0444, root, ibd,
+                           &_tx_opcode_stats_file_ops);
+       debugfs_create_file("ctx_stats", 0444, root, ibd, &_ctx_stats_file_ops);
+       debugfs_create_file("qp_stats", 0444, root, ibd, &_qp_stats_file_ops);
+       debugfs_create_file("sdes", 0444, root, ibd, &_sdes_file_ops);
+       debugfs_create_file("rcds", 0444, root, ibd, &_rcds_file_ops);
+       debugfs_create_file("pios", 0444, root, ibd, &_pios_file_ops);
+       debugfs_create_file("sdma_cpu_list", 0444, root, ibd,
+                           &_sdma_cpu_list_file_ops);
+
        /* dev counter files */
        for (i = 0; i < ARRAY_SIZE(cntr_ops); i++)
-               DEBUGFS_FILE_CREATE(cntr_ops[i].name,
-                                   ibd->hfi1_ibdev_dbg,
-                                   dd,
-                                   &cntr_ops[i].ops, S_IRUGO);
+               debugfs_create_file(cntr_ops[i].name, 0444, root, dd,
+                                   &cntr_ops[i].ops);
+
        /* per port files */
        for (ppd = dd->pport, j = 0; j < dd->num_pports; j++, ppd++)
                for (i = 0; i < ARRAY_SIZE(port_cntr_ops); i++) {
@@ -1206,12 +1205,11 @@ void hfi1_dbg_ibdev_init(struct hfi1_ibdev *ibd)
                                 sizeof(name),
                                 port_cntr_ops[i].name,
                                 j + 1);
-                       DEBUGFS_FILE_CREATE(name,
-                                           ibd->hfi1_ibdev_dbg,
-                                           ppd,
-                                           &port_cntr_ops[i].ops,
+                       debugfs_create_file(name,
                                            !port_cntr_ops[i].ops.write ?
-                                           S_IRUGO : S_IRUGO | S_IWUSR);
+                                                   S_IRUGO :
+                                                   S_IRUGO | S_IWUSR,
+                                           root, ppd, &port_cntr_ops[i].ops);
                }
 
        hfi1_fault_init_debugfs(ibd);
@@ -1343,8 +1341,10 @@ void hfi1_dbg_init(void)
        hfi1_dbg_root  = debugfs_create_dir(DRIVER_NAME, NULL);
        if (!hfi1_dbg_root)
                pr_warn("init of debugfs failed\n");
-       DEBUGFS_SEQ_FILE_CREATE(driver_stats_names, hfi1_dbg_root, NULL);
-       DEBUGFS_SEQ_FILE_CREATE(driver_stats, hfi1_dbg_root, NULL);
+       debugfs_create_file("driver_stats_names", 0444, hfi1_dbg_root, NULL,
+                           &_driver_stats_names_file_ops);
+       debugfs_create_file("driver_stats", 0444, hfi1_dbg_root, NULL,
+                           &_driver_stats_file_ops);
 }
 
 void hfi1_dbg_exit(void)

diff --git a/drivers/infiniband/hw/hfi1/debugfs.h b/drivers/infiniband/hw/hfi1/debugfs.h
index d5d8244..57e582c 100644 (file)
--- a/drivers/infiniband/hw/hfi1/debugfs.h
+++ b/drivers/infiniband/hw/hfi1/debugfs.h
@@ -49,16 +49,6 @@
 
 struct hfi1_ibdev;
 
-#define DEBUGFS_FILE_CREATE(name, parent, data, ops, mode)     \
-do { \
-       struct dentry *ent; \
-       const char *__name = name; \
-       ent = debugfs_create_file(__name, mode, parent, \
-               data, ops); \
-       if (!ent) \
-               pr_warn("create of %s failed\n", __name); \
-} while (0)
-
 #define DEBUGFS_SEQ_FILE_OPS(name) \
 static const struct seq_operations _##name##_seq_ops = { \
        .start = _##name##_seq_start, \
@@ -89,8 +79,6 @@ static const struct file_operations _##name##_file_ops = { \
        .release = seq_release \
 }
 
-#define DEBUGFS_SEQ_FILE_CREATE(name, parent, data) \
-       DEBUGFS_FILE_CREATE(#name, parent, data, &_##name##_file_ops, 0444)
 
 ssize_t hfi1_seq_read(struct file *file, char __user *buf, size_t size,
                      loff_t *ppos);

diff --git a/drivers/infiniband/hw/hfi1/fault.c b/drivers/infiniband/hw/hfi1/fault.c
index e2290f3..dd09b85 100644 (file)
--- a/drivers/infiniband/hw/hfi1/fault.c
+++ b/drivers/infiniband/hw/hfi1/fault.c
@@ -278,7 +278,8 @@ int hfi1_fault_init_debugfs(struct hfi1_ibdev *ibd)
                return -ENOENT;
        }
 
-       DEBUGFS_SEQ_FILE_CREATE(fault_stats, ibd->fault->dir, ibd);
+       debugfs_create_file("fault_stats", 0444, ibd->fault->dir, ibd,
+                           &_fault_stats_file_ops);
        if (!debugfs_create_bool("enable", 0600, ibd->fault->dir,
                                 &ibd->fault->enable))
                goto fail;