1 files changed, 4 insertions, 46 deletions

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/debug.c b/drivers/net/wireless/brcm80211/brcmfmac/debug.c
index 9b473d50b005..2d6d00553858 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/debug.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/debug.c
@@ -41,15 +41,6 @@ void brcmf_debugfs_exit(void)
         root_folder = NULL;
 }
 
-static int brcmf_debugfs_chipinfo_read(struct seq_file *seq, void *data)
-{
-        struct brcmf_bus *bus = dev_get_drvdata(seq->private);
-
-        seq_printf(seq, "chip: %x(%u) rev %u\n",
-                   bus->chip, bus->chip, bus->chiprev);
-        return 0;
-}
-
 int brcmf_debugfs_attach(struct brcmf_pub *drvr)
 {
         struct device *dev = drvr->bus_if->dev;
@@ -58,7 +49,6 @@ int brcmf_debugfs_attach(struct brcmf_pub *drvr)
                 return -ENODEV;
 
         drvr->dbgfs_dir = debugfs_create_dir(dev_name(dev), root_folder);
-        brcmf_debugfs_add_entry(drvr, "chipinfo", brcmf_debugfs_chipinfo_read);
 
         return PTR_ERR_OR_ZERO(drvr->dbgfs_dir);
 }
@@ -74,44 +64,12 @@ struct dentry *brcmf_debugfs_get_devdir(struct brcmf_pub *drvr)
         return drvr->dbgfs_dir;
 }
 
-struct brcmf_debugfs_entry {
-        int (*read)(struct seq_file *seq, void *data);
-        struct brcmf_pub *drvr;
-};
-
-static int brcmf_debugfs_entry_open(struct inode *inode, struct file *f)
-{
-        struct brcmf_debugfs_entry *entry = inode->i_private;
-
-        return single_open(f, entry->read, entry->drvr->bus_if->dev);
-}
-
-static const struct file_operations brcmf_debugfs_def_ops = {
-        .owner = THIS_MODULE,
-        .open = brcmf_debugfs_entry_open,
-        .release = single_release,
-        .read = seq_read,
-        .llseek = seq_lseek
-};
-
 int brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn,
                             int (*read_fn)(struct seq_file *seq, void *data))
 {
-        struct dentry *dentry =  drvr->dbgfs_dir;
-        struct brcmf_debugfs_entry *entry;
-
-        if (IS_ERR_OR_NULL(dentry))
-                return -ENOENT;
-
-        entry = devm_kzalloc(drvr->bus_if->dev, sizeof(*entry), GFP_KERNEL);
-        if (!entry)
-                return -ENOMEM;
-
-        entry->read = read_fn;
-        entry->drvr = drvr;
-
-        dentry = debugfs_create_file(fn, S_IRUGO, dentry, entry,
-                                     &brcmf_debugfs_def_ops);
+        struct dentry *e;
 
-        return PTR_ERR_OR_ZERO(dentry);
+        e = debugfs_create_devm_seqfile(drvr->bus_if->dev, fn,
+                                        drvr->dbgfs_dir, read_fn);
+        return PTR_ERR_OR_ZERO(e);
 }