Merge tag 'wireless-drivers-next-for-davem-2019-02-06' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says: ==================== wireless-drivers-next patches for 5.1 First set of patches for 5.1. Lots of new features in various drivers but nothing really special standing out. Major changes: brcmfmac * DMI nvram filename quirk for PoV TAB-P1006W-232 tablet rsi * support for hardware scan offload iwlwifi * support for Target Wakeup Time (TWT) -- a feature that allows the AP to specify when individual stations can access the medium * support for mac80211 AMSDU handling * some new PCI IDs * relicense the pcie submodule to dual GPL/BSD * reworked the TOF/CSI (channel estimation matrix) implementation * Some product name updates in the human-readable strings mt76 * energy detect regulatory compliance fixes * preparation for MT7603 support * channel switch announcement support mwifiex * support for sd8977 chipset qtnfmac * support for 4addr mode * convert to SPDX license identifiers ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -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)
|
||||
|
Reference in New Issue
Block a user