1909a42ad4
There are two important patches in this patchset: updating read pointer quicker & rework of .get_station(). There are few more upstream patches that are p2p-related and weren't backported in this commit. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 46084
69 lines
2.1 KiB
Diff
69 lines
2.1 KiB
Diff
From: Arend van Spriel <arend@broadcom.com>
|
|
Date: Mon, 8 Jun 2015 14:38:35 +0200
|
|
Subject: [PATCH] brcmfmac: use debugfs_create_devm_seqfile() helper
|
|
function
|
|
|
|
Some time ago the function debugfs_create_devm_seqfile() was
|
|
introduced in debugfs. The caller simply needs to provide a
|
|
device pointer and read function. The function brcmf_debugfs_add_entry()
|
|
is now simply a wrapper only doing the work for CONFIG_BRCMDBG.
|
|
|
|
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
|
|
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
|
|
Reviewed-by: Daniel (Deognyoun) Kim <dekim@broadcom.com>
|
|
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
|
|
Signed-off-by: Arend van Spriel <arend@broadcom.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
|
|
--- a/drivers/net/wireless/brcm80211/brcmfmac/debug.c
|
|
+++ b/drivers/net/wireless/brcm80211/brcmfmac/debug.c
|
|
@@ -64,44 +64,12 @@ struct dentry *brcmf_debugfs_get_devdir(
|
|
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);
|
|
}
|