]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
brcmsmac: no need to check return value of debugfs_create functions
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 22 Jan 2019 15:21:31 +0000 (16:21 +0100)
committerKalle Valo <kvalo@codeaurora.org>
Fri, 1 Feb 2019 12:37:28 +0000 (14:37 +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: Arend van Spriel <arend.vanspriel@broadcom.com>
Cc: Franky Lin <franky.lin@broadcom.com>
Cc: Hante Meuleman <hante.meuleman@broadcom.com>
Cc: Chi-Hsien Lin <chi-hsien.lin@cypress.com>
Cc: Wright Feng <wright.feng@cypress.com>
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: linux-wireless@vger.kernel.org
Cc: brcm80211-dev-list.pdl@broadcom.com
Cc: brcm80211-dev-list@cypress.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Arend van Spriel
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.c
drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.h

index 3bd54f125776217cec982a3d23c1cc490dd0b44e..6d776ef6ff54eb52d80cb6de10dfbbafbe7501ad 100644 (file)
@@ -37,27 +37,18 @@ static struct dentry *root_folder;
 void brcms_debugfs_init(void)
 {
        root_folder = debugfs_create_dir(KBUILD_MODNAME, NULL);
-       if (IS_ERR(root_folder))
-               root_folder = NULL;
 }
 
 void brcms_debugfs_exit(void)
 {
-       if (!root_folder)
-               return;
-
        debugfs_remove_recursive(root_folder);
        root_folder = NULL;
 }
 
-int brcms_debugfs_attach(struct brcms_pub *drvr)
+void brcms_debugfs_attach(struct brcms_pub *drvr)
 {
-       if (!root_folder)
-               return -ENODEV;
-
        drvr->dbgfs_dir = debugfs_create_dir(
                 dev_name(&drvr->wlc->hw->d11core->dev), root_folder);
-       return PTR_ERR_OR_ZERO(drvr->dbgfs_dir);
 }
 
 void brcms_debugfs_detach(struct brcms_pub *drvr)
@@ -195,7 +186,7 @@ static const struct file_operations brcms_debugfs_def_ops = {
        .llseek = seq_lseek
 };
 
-static int
+static void
 brcms_debugfs_add_entry(struct brcms_pub *drvr, const char *fn,
                        int (*read_fn)(struct seq_file *seq, void *data))
 {
@@ -203,27 +194,18 @@ brcms_debugfs_add_entry(struct brcms_pub *drvr, const char *fn,
        struct dentry *dentry =  drvr->dbgfs_dir;
        struct brcms_debugfs_entry *entry;
 
-       if (IS_ERR_OR_NULL(dentry))
-               return -ENOENT;
-
        entry = devm_kzalloc(dev, sizeof(*entry), GFP_KERNEL);
        if (!entry)
-               return -ENOMEM;
+               return;
 
        entry->read = read_fn;
        entry->drvr = drvr;
 
-       dentry = debugfs_create_file(fn, 0444, dentry, entry,
-                                    &brcms_debugfs_def_ops);
-
-       return PTR_ERR_OR_ZERO(dentry);
+       debugfs_create_file(fn, 0444, dentry, entry, &brcms_debugfs_def_ops);
 }
 
 void brcms_debugfs_create_files(struct brcms_pub *drvr)
 {
-       if (IS_ERR_OR_NULL(drvr->dbgfs_dir))
-               return;
-
        brcms_debugfs_add_entry(drvr, "hardware", brcms_debugfs_hardware_read);
        brcms_debugfs_add_entry(drvr, "macstat", brcms_debugfs_macstat_read);
 }
index 822781cf15d41900aabd941fe79956191e1328ed..56898e6d789d74022854dbef494debfc542e80e5 100644 (file)
@@ -68,7 +68,7 @@ void __brcms_dbg(struct device *dev, u32 level, const char *func,
 struct brcms_pub;
 void brcms_debugfs_init(void);
 void brcms_debugfs_exit(void);
-int brcms_debugfs_attach(struct brcms_pub *drvr);
+void brcms_debugfs_attach(struct brcms_pub *drvr);
 void brcms_debugfs_detach(struct brcms_pub *drvr);
 struct dentry *brcms_debugfs_get_devdir(struct brcms_pub *drvr);
 void brcms_debugfs_create_files(struct brcms_pub *drvr);