diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-08 10:44:55 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-08 10:44:55 -0400 |
| commit | 73e8fb2d596d5903cde6dcced39c0b88b5770a56 (patch) | |
| tree | 27c63346b888ce8f086a81ad801755bc1d4aa2d8 /drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c | |
| parent | 33e09f0ee76e9e4108c5aed67e027ef5e3fe0634 (diff) | |
| parent | 3baf32898e1c88792fa7cadc88f601833bdae3da (diff) | |
| download | linux-73e8fb2d596d5903cde6dcced39c0b88b5770a56.tar.gz linux-73e8fb2d596d5903cde6dcced39c0b88b5770a56.tar.bz2 linux-73e8fb2d596d5903cde6dcced39c0b88b5770a56.zip | |
Merge branch 'work.const-qstr' into work.misc
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c index f6591c83d636..affe760c8c22 100644 --- a/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c +++ b/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c @@ -2422,14 +2422,12 @@ int iwl_dbgfs_register(struct iwl_priv *priv, struct dentry *dbgfs_dir) */ if (priv->mac80211_registered) { char buf[100]; - struct dentry *mac80211_dir, *dev_dir, *root_dir; + struct dentry *mac80211_dir, *dev_dir; dev_dir = dbgfs_dir->d_parent; - root_dir = dev_dir->d_parent; mac80211_dir = priv->hw->wiphy->debugfsdir; - snprintf(buf, 100, "../../%s/%s", root_dir->d_name.name, - dev_dir->d_name.name); + snprintf(buf, 100, "../../%pd2", dev_dir); if (!debugfs_create_symlink("iwlwifi", mac80211_dir, buf)) goto err; |