Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27a22096 authored by Al Viro's avatar Al Viro
Browse files

iwlwifi: use %pd 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent f66debf1

drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

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

+7 −9
Original line number Diff line number Diff line
@@ -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);



	if (!mvmvif->dbgfs_dir) {

		IWL_ERR(mvm, "Failed to create debugfs directory under %s\n",

			dbgfs_dir->d_name.name);

		IWL_ERR(mvm, "Failed to create debugfs directory under %pd\n",

			dbgfs_dir);

		return;

	}
@@ -1602,17 +1602,15 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 
	 * find

	 * netdev:wlan0 -> ../../../ieee80211/phy0/netdev:wlan0/iwlmvm/

	 */

	snprintf(buf, 100, "../../../%s/%s/%s/%s",

		 dbgfs_dir->d_parent->d_parent->d_name.name,

		 dbgfs_dir->d_parent->d_name.name,

		 dbgfs_dir->d_name.name,

		 mvmvif->dbgfs_dir->d_name.name);

	snprintf(buf, 100, "../../../%pd3/%pd",

		 dbgfs_dir,

		 mvmvif->dbgfs_dir);



	mvmvif->dbgfs_slink = debugfs_create_symlink(dbgfs_dir->d_name.name,

						     mvm->debugfs_dir, buf);

	if (!mvmvif->dbgfs_slink)

		IWL_ERR(mvm, "Can't create debugfs symbolic link under %s\n",

			dbgfs_dir->d_name.name);

		IWL_ERR(mvm, "Can't create debugfs symbolic link under %pd\n",

			dbgfs_dir);

	return;

err:

	IWL_ERR(mvm, "Can't create debugfs entity\n");

drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c

+1 −3
Original line number Diff line number Diff line
@@ -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

	 * exists (before the opmode exists which removes the target.)

	 */

	snprintf(buf, 100, "../../%s/%s",

		 dbgfs_dir->d_parent->d_parent->d_name.name,

		 dbgfs_dir->d_parent->d_name.name);

	snprintf(buf, 100, "../../%pd2", dbgfs_dir->d_parent);

	if (!debugfs_create_symlink("iwlwifi", mvm->hw->wiphy->debugfsdir, buf))

		goto err;