korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-15 15:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

iwlwifi: use %pd

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2016-08-07 12:21:25 -04:00
parent f66debf1b3
commit 27a22096b2
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c
View File

@ -2422,14 +2422,12 @@ int iwl_dbgfs_register(struct iwl_priv *priv, struct dentry *dbgfs_dir)
*/ */
if (priv->mac80211_registered) { if (priv->mac80211_registered) {
char buf[100]; char buf[100];
struct dentry *mac80211_dir, *dev_dir, *root_dir; struct dentry *mac80211_dir, *dev_dir;
dev_dir = dbgfs_dir->d_parent; dev_dir = dbgfs_dir->d_parent;
root_dir = dev_dir->d_parent;
mac80211_dir = priv->hw->wiphy->debugfsdir; mac80211_dir = priv->hw->wiphy->debugfsdir;
snprintf(buf, 100, "../../%s/%s", root_dir->d_name.name, snprintf(buf, 100, "../../%pd2", dev_dir);
dev_dir->d_name.name);
if (!debugfs_create_symlink("iwlwifi", mac80211_dir, buf)) if (!debugfs_create_symlink("iwlwifi", mac80211_dir, buf))
goto err; goto err;

16
drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
View File

@ -1547,8 +1547,8 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
mvmvif->dbgfs_dir = debugfs_create_dir("iwlmvm", dbgfs_dir); mvmvif->dbgfs_dir = debugfs_create_dir("iwlmvm", dbgfs_dir);
if (!mvmvif->dbgfs_dir) { if (!mvmvif->dbgfs_dir) {
IWL_ERR(mvm, "Failed to create debugfs directory under %s\n", IWL_ERR(mvm, "Failed to create debugfs directory under %pd\n",
dbgfs_dir->d_name.name); dbgfs_dir);
return; return;
} }
@ -1602,17 +1602,15 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
* find * find
* netdev:wlan0 -> ../../../ieee80211/phy0/netdev:wlan0/iwlmvm/ * netdev:wlan0 -> ../../../ieee80211/phy0/netdev:wlan0/iwlmvm/
*/ */
snprintf(buf, 100, "../../../%s/%s/%s/%s", snprintf(buf, 100, "../../../%pd3/%pd",
dbgfs_dir->d_parent->d_parent->d_name.name, dbgfs_dir,
dbgfs_dir->d_parent->d_name.name, mvmvif->dbgfs_dir);
dbgfs_dir->d_name.name,
mvmvif->dbgfs_dir->d_name.name);
mvmvif->dbgfs_slink = debugfs_create_symlink(dbgfs_dir->d_name.name, mvmvif->dbgfs_slink = debugfs_create_symlink(dbgfs_dir->d_name.name,
mvm->debugfs_dir, buf); mvm->debugfs_dir, buf);
if (!mvmvif->dbgfs_slink) if (!mvmvif->dbgfs_slink)
IWL_ERR(mvm, "Can't create debugfs symbolic link under %s\n", IWL_ERR(mvm, "Can't create debugfs symbolic link under %pd\n",
dbgfs_dir->d_name.name); dbgfs_dir);
return; return;
err: err:
IWL_ERR(mvm, "Can't create debugfs entity\n"); IWL_ERR(mvm, "Can't create debugfs entity\n");

4
drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
View File

@ -1564,9 +1564,7 @@ int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir)
* Create a symlink with mac80211. It will be removed when mac80211 * Create a symlink with mac80211. It will be removed when mac80211
* exists (before the opmode exists which removes the target.) * exists (before the opmode exists which removes the target.)
*/ */
snprintf(buf, 100, "../../%s/%s", snprintf(buf, 100, "../../%pd2", dbgfs_dir->d_parent);
dbgfs_dir->d_parent->d_parent->d_name.name,
dbgfs_dir->d_parent->d_name.name);
if (!debugfs_create_symlink("iwlwifi", mvm->hw->wiphy->debugfsdir, buf)) if (!debugfs_create_symlink("iwlwifi", mvm->hw->wiphy->debugfsdir, buf))
goto err; goto err;