]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
b43: no need to check return value of debugfs_create functions
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 22 Jan 2019 15:21:29 +0000 (16:21 +0100)
committerKalle Valo <kvalo@codeaurora.org>
Fri, 1 Feb 2019 12:35:24 +0000 (14:35 +0200)
When calling debugfs functions, there is no need to ever check the
return value.  The function can work or not, but the code logic should
never do something different based on this.

Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: linux-wireless@vger.kernel.org
Cc: b43-dev@lists.infradead.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/broadcom/b43/debugfs.c

index 77046384dd8004c60493012d94fe5d82ba9ab667..976c8ec4e9928749e92d04caeb2e46500099323d 100644 (file)
@@ -668,15 +668,13 @@ static void b43_remove_dynamic_debug(struct b43_wldev *dev)
 static void b43_add_dynamic_debug(struct b43_wldev *dev)
 {
        struct b43_dfsentry *e = dev->dfsentry;
-       struct dentry *d;
 
-#define add_dyn_dbg(name, id, initstate) do {          \
-       e->dyn_debug[id] = (initstate);                 \
-       d = debugfs_create_bool(name, 0600, e->subdir,  \
-                               &(e->dyn_debug[id]));   \
-       if (!IS_ERR(d))                                 \
-               e->dyn_debug_dentries[id] = d;          \
-                               } while (0)
+#define add_dyn_dbg(name, id, initstate) do {                  \
+       e->dyn_debug[id] = (initstate);                         \
+       e->dyn_debug_dentries[id] =                             \
+               debugfs_create_bool(name, 0600, e->subdir,      \
+                               &(e->dyn_debug[id]));           \
+       } while (0)
 
        add_dyn_dbg("debug_xmitpower", B43_DBG_XMITPOWER, false);
        add_dyn_dbg("debug_dmaoverflow", B43_DBG_DMAOVERFLOW, false);
@@ -718,19 +716,6 @@ void b43_debugfs_add_device(struct b43_wldev *dev)
 
        snprintf(devdir, sizeof(devdir), "%s", wiphy_name(dev->wl->hw->wiphy));
        e->subdir = debugfs_create_dir(devdir, rootdir);
-       if (!e->subdir || IS_ERR(e->subdir)) {
-               if (e->subdir == ERR_PTR(-ENODEV)) {
-                       b43dbg(dev->wl, "DebugFS (CONFIG_DEBUG_FS) not "
-                              "enabled in kernel config\n");
-               } else {
-                       b43err(dev->wl, "debugfs: cannot create %s directory\n",
-                              devdir);
-               }
-               dev->dfsentry = NULL;
-               kfree(log->log);
-               kfree(e);
-               return;
-       }
 
        e->mmio16read_next = 0xFFFF; /* invalid address */
        e->mmio32read_next = 0xFFFF; /* invalid address */
@@ -741,13 +726,10 @@ void b43_debugfs_add_device(struct b43_wldev *dev)
 
 #define ADD_FILE(name, mode)   \
        do {                                                    \
-               struct dentry *d;                               \
-               d = debugfs_create_file(__stringify(name),      \
+               e->file_##name.dentry =                         \
+                       debugfs_create_file(__stringify(name),  \
                                        mode, e->subdir, dev,   \
                                        &fops_##name.fops);     \
-               e->file_##name.dentry = NULL;                   \
-               if (!IS_ERR(d))                                 \
-                       e->file_##name.dentry = d;              \
        } while (0)
 
 
@@ -818,8 +800,6 @@ void b43_debugfs_log_txstat(struct b43_wldev *dev,
 void b43_debugfs_init(void)
 {
        rootdir = debugfs_create_dir(KBUILD_MODNAME, NULL);
-       if (IS_ERR(rootdir))
-               rootdir = NULL;
 }
 
 void b43_debugfs_exit(void)