* [PATCH] mediatek/mt7601u: add debugfs exit function
@ 2022-04-22 7:03 ` Bernard Zhao
0 siblings, 0 replies; 12+ messages in thread
From: Bernard Zhao @ 2022-04-22 7:03 UTC (permalink / raw)
To: Jakub Kicinski, Kalle Valo, David S. Miller, Paolo Abeni,
Matthias Brugger, linux-wireless, netdev, linux-arm-kernel,
linux-mediatek, linux-kernel
Cc: bernard, Bernard Zhao
When mt7601u loaded, there are two cases:
First when mt7601u is loaded, in function mt7601u_probe, if
function mt7601u_probe run into error lable err_hw,
mt7601u_cleanup didn`t cleanup the debugfs node.
Second when the module disconnect, in function mt7601u_disconnect,
mt7601u_cleanup didn`t cleanup the debugfs node.
This patch add debugfs exit function and try to cleanup debugfs
node when mt7601u loaded fail or unloaded.
Signed-off-by: Bernard Zhao <zhaojunkui2008@126.com>
---
.../net/wireless/mediatek/mt7601u/debugfs.c | 25 +++++++++++--------
drivers/net/wireless/mediatek/mt7601u/init.c | 5 ++++
.../net/wireless/mediatek/mt7601u/mt7601u.h | 4 +++
3 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt7601u/debugfs.c b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
index 20669eacb66e..1ae3d75d3c9b 100644
--- a/drivers/net/wireless/mediatek/mt7601u/debugfs.c
+++ b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
@@ -124,17 +124,22 @@ DEFINE_SHOW_ATTRIBUTE(mt7601u_eeprom_param);
void mt7601u_init_debugfs(struct mt7601u_dev *dev)
{
- struct dentry *dir;
-
- dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
- if (!dir)
+ dev->root_dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
+ if (!dev->root_dir)
return;
- debugfs_create_u8("temperature", 0400, dir, &dev->raw_temp);
- debugfs_create_u32("temp_mode", 0400, dir, &dev->temp_mode);
+ debugfs_create_u8("temperature", 0400, dev->root_dir, &dev->raw_temp);
+ debugfs_create_u32("temp_mode", 0400, dev->root_dir, &dev->temp_mode);
+
+ debugfs_create_u32("regidx", 0600, dev->root_dir, &dev->debugfs_reg);
+ debugfs_create_file("regval", 0600, dev->root_dir, dev, &fops_regval);
+ debugfs_create_file("ampdu_stat", 0400, dev->root_dir, dev, &mt7601u_ampdu_stat_fops);
+ debugfs_create_file("eeprom_param", 0400, dev->root_dir, dev, &mt7601u_eeprom_param_fops);
+}
- debugfs_create_u32("regidx", 0600, dir, &dev->debugfs_reg);
- debugfs_create_file("regval", 0600, dir, dev, &fops_regval);
- debugfs_create_file("ampdu_stat", 0400, dir, dev, &mt7601u_ampdu_stat_fops);
- debugfs_create_file("eeprom_param", 0400, dir, dev, &mt7601u_eeprom_param_fops);
+void mt7601u_exit_debugfs(struct mt7601u_dev *dev)
+{
+ if (!dev->root_dir)
+ return;
+ debugfs_remove(dev->root_dir);
}
diff --git a/drivers/net/wireless/mediatek/mt7601u/init.c b/drivers/net/wireless/mediatek/mt7601u/init.c
index 5d9e952b2966..1e905ef2ed19 100644
--- a/drivers/net/wireless/mediatek/mt7601u/init.c
+++ b/drivers/net/wireless/mediatek/mt7601u/init.c
@@ -427,6 +427,9 @@ void mt7601u_cleanup(struct mt7601u_dev *dev)
mt7601u_stop_hardware(dev);
mt7601u_dma_cleanup(dev);
mt7601u_mcu_cmd_deinit(dev);
+#ifdef CONFIG_DEBUG_FS
+ mt7601u_exit_debugfs(dev);
+#endif
}
struct mt7601u_dev *mt7601u_alloc_device(struct device *pdev)
@@ -625,7 +628,9 @@ int mt7601u_register_device(struct mt7601u_dev *dev)
if (ret)
return ret;
+#ifdef CONFIG_DEBUG_FS
mt7601u_init_debugfs(dev);
+#endif
return 0;
}
diff --git a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
index a122f1dd38f6..c5f06818bb35 100644
--- a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
+++ b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
@@ -242,6 +242,9 @@ struct mt7601u_dev {
u32 rf_pa_mode[2];
struct mac_stats stats;
+#ifdef CONFIG_DEBUG_FS
+ struct dentry *root_dir;
+#endif
};
struct mt7601u_tssi_params {
@@ -279,6 +282,7 @@ struct mt7601u_rxwi;
extern const struct ieee80211_ops mt7601u_ops;
void mt7601u_init_debugfs(struct mt7601u_dev *dev);
+void mt7601u_exit_debugfs(struct mt7601u_dev *dev);
u32 mt7601u_rr(struct mt7601u_dev *dev, u32 offset);
void mt7601u_wr(struct mt7601u_dev *dev, u32 offset, u32 val);
--
2.33.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH] mediatek/mt7601u: add debugfs exit function
@ 2022-04-22 7:03 ` Bernard Zhao
0 siblings, 0 replies; 12+ messages in thread
From: Bernard Zhao @ 2022-04-22 7:03 UTC (permalink / raw)
To: Jakub Kicinski, Kalle Valo, David S. Miller, Paolo Abeni,
Matthias Brugger, linux-wireless, netdev, linux-arm-kernel,
linux-mediatek, linux-kernel
Cc: bernard, Bernard Zhao
When mt7601u loaded, there are two cases:
First when mt7601u is loaded, in function mt7601u_probe, if
function mt7601u_probe run into error lable err_hw,
mt7601u_cleanup didn`t cleanup the debugfs node.
Second when the module disconnect, in function mt7601u_disconnect,
mt7601u_cleanup didn`t cleanup the debugfs node.
This patch add debugfs exit function and try to cleanup debugfs
node when mt7601u loaded fail or unloaded.
Signed-off-by: Bernard Zhao <zhaojunkui2008@126.com>
---
.../net/wireless/mediatek/mt7601u/debugfs.c | 25 +++++++++++--------
drivers/net/wireless/mediatek/mt7601u/init.c | 5 ++++
.../net/wireless/mediatek/mt7601u/mt7601u.h | 4 +++
3 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt7601u/debugfs.c b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
index 20669eacb66e..1ae3d75d3c9b 100644
--- a/drivers/net/wireless/mediatek/mt7601u/debugfs.c
+++ b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
@@ -124,17 +124,22 @@ DEFINE_SHOW_ATTRIBUTE(mt7601u_eeprom_param);
void mt7601u_init_debugfs(struct mt7601u_dev *dev)
{
- struct dentry *dir;
-
- dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
- if (!dir)
+ dev->root_dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
+ if (!dev->root_dir)
return;
- debugfs_create_u8("temperature", 0400, dir, &dev->raw_temp);
- debugfs_create_u32("temp_mode", 0400, dir, &dev->temp_mode);
+ debugfs_create_u8("temperature", 0400, dev->root_dir, &dev->raw_temp);
+ debugfs_create_u32("temp_mode", 0400, dev->root_dir, &dev->temp_mode);
+
+ debugfs_create_u32("regidx", 0600, dev->root_dir, &dev->debugfs_reg);
+ debugfs_create_file("regval", 0600, dev->root_dir, dev, &fops_regval);
+ debugfs_create_file("ampdu_stat", 0400, dev->root_dir, dev, &mt7601u_ampdu_stat_fops);
+ debugfs_create_file("eeprom_param", 0400, dev->root_dir, dev, &mt7601u_eeprom_param_fops);
+}
- debugfs_create_u32("regidx", 0600, dir, &dev->debugfs_reg);
- debugfs_create_file("regval", 0600, dir, dev, &fops_regval);
- debugfs_create_file("ampdu_stat", 0400, dir, dev, &mt7601u_ampdu_stat_fops);
- debugfs_create_file("eeprom_param", 0400, dir, dev, &mt7601u_eeprom_param_fops);
+void mt7601u_exit_debugfs(struct mt7601u_dev *dev)
+{
+ if (!dev->root_dir)
+ return;
+ debugfs_remove(dev->root_dir);
}
diff --git a/drivers/net/wireless/mediatek/mt7601u/init.c b/drivers/net/wireless/mediatek/mt7601u/init.c
index 5d9e952b2966..1e905ef2ed19 100644
--- a/drivers/net/wireless/mediatek/mt7601u/init.c
+++ b/drivers/net/wireless/mediatek/mt7601u/init.c
@@ -427,6 +427,9 @@ void mt7601u_cleanup(struct mt7601u_dev *dev)
mt7601u_stop_hardware(dev);
mt7601u_dma_cleanup(dev);
mt7601u_mcu_cmd_deinit(dev);
+#ifdef CONFIG_DEBUG_FS
+ mt7601u_exit_debugfs(dev);
+#endif
}
struct mt7601u_dev *mt7601u_alloc_device(struct device *pdev)
@@ -625,7 +628,9 @@ int mt7601u_register_device(struct mt7601u_dev *dev)
if (ret)
return ret;
+#ifdef CONFIG_DEBUG_FS
mt7601u_init_debugfs(dev);
+#endif
return 0;
}
diff --git a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
index a122f1dd38f6..c5f06818bb35 100644
--- a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
+++ b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
@@ -242,6 +242,9 @@ struct mt7601u_dev {
u32 rf_pa_mode[2];
struct mac_stats stats;
+#ifdef CONFIG_DEBUG_FS
+ struct dentry *root_dir;
+#endif
};
struct mt7601u_tssi_params {
@@ -279,6 +282,7 @@ struct mt7601u_rxwi;
extern const struct ieee80211_ops mt7601u_ops;
void mt7601u_init_debugfs(struct mt7601u_dev *dev);
+void mt7601u_exit_debugfs(struct mt7601u_dev *dev);
u32 mt7601u_rr(struct mt7601u_dev *dev, u32 offset);
void mt7601u_wr(struct mt7601u_dev *dev, u32 offset, u32 val);
--
2.33.1
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH] mediatek/mt7601u: add debugfs exit function
@ 2022-04-22 7:03 ` Bernard Zhao
0 siblings, 0 replies; 12+ messages in thread
From: Bernard Zhao @ 2022-04-22 7:03 UTC (permalink / raw)
To: Jakub Kicinski, Kalle Valo, David S. Miller, Paolo Abeni,
Matthias Brugger, linux-wireless, netdev, linux-arm-kernel,
linux-mediatek, linux-kernel
Cc: bernard, Bernard Zhao
When mt7601u loaded, there are two cases:
First when mt7601u is loaded, in function mt7601u_probe, if
function mt7601u_probe run into error lable err_hw,
mt7601u_cleanup didn`t cleanup the debugfs node.
Second when the module disconnect, in function mt7601u_disconnect,
mt7601u_cleanup didn`t cleanup the debugfs node.
This patch add debugfs exit function and try to cleanup debugfs
node when mt7601u loaded fail or unloaded.
Signed-off-by: Bernard Zhao <zhaojunkui2008@126.com>
---
.../net/wireless/mediatek/mt7601u/debugfs.c | 25 +++++++++++--------
drivers/net/wireless/mediatek/mt7601u/init.c | 5 ++++
.../net/wireless/mediatek/mt7601u/mt7601u.h | 4 +++
3 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt7601u/debugfs.c b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
index 20669eacb66e..1ae3d75d3c9b 100644
--- a/drivers/net/wireless/mediatek/mt7601u/debugfs.c
+++ b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
@@ -124,17 +124,22 @@ DEFINE_SHOW_ATTRIBUTE(mt7601u_eeprom_param);
void mt7601u_init_debugfs(struct mt7601u_dev *dev)
{
- struct dentry *dir;
-
- dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
- if (!dir)
+ dev->root_dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
+ if (!dev->root_dir)
return;
- debugfs_create_u8("temperature", 0400, dir, &dev->raw_temp);
- debugfs_create_u32("temp_mode", 0400, dir, &dev->temp_mode);
+ debugfs_create_u8("temperature", 0400, dev->root_dir, &dev->raw_temp);
+ debugfs_create_u32("temp_mode", 0400, dev->root_dir, &dev->temp_mode);
+
+ debugfs_create_u32("regidx", 0600, dev->root_dir, &dev->debugfs_reg);
+ debugfs_create_file("regval", 0600, dev->root_dir, dev, &fops_regval);
+ debugfs_create_file("ampdu_stat", 0400, dev->root_dir, dev, &mt7601u_ampdu_stat_fops);
+ debugfs_create_file("eeprom_param", 0400, dev->root_dir, dev, &mt7601u_eeprom_param_fops);
+}
- debugfs_create_u32("regidx", 0600, dir, &dev->debugfs_reg);
- debugfs_create_file("regval", 0600, dir, dev, &fops_regval);
- debugfs_create_file("ampdu_stat", 0400, dir, dev, &mt7601u_ampdu_stat_fops);
- debugfs_create_file("eeprom_param", 0400, dir, dev, &mt7601u_eeprom_param_fops);
+void mt7601u_exit_debugfs(struct mt7601u_dev *dev)
+{
+ if (!dev->root_dir)
+ return;
+ debugfs_remove(dev->root_dir);
}
diff --git a/drivers/net/wireless/mediatek/mt7601u/init.c b/drivers/net/wireless/mediatek/mt7601u/init.c
index 5d9e952b2966..1e905ef2ed19 100644
--- a/drivers/net/wireless/mediatek/mt7601u/init.c
+++ b/drivers/net/wireless/mediatek/mt7601u/init.c
@@ -427,6 +427,9 @@ void mt7601u_cleanup(struct mt7601u_dev *dev)
mt7601u_stop_hardware(dev);
mt7601u_dma_cleanup(dev);
mt7601u_mcu_cmd_deinit(dev);
+#ifdef CONFIG_DEBUG_FS
+ mt7601u_exit_debugfs(dev);
+#endif
}
struct mt7601u_dev *mt7601u_alloc_device(struct device *pdev)
@@ -625,7 +628,9 @@ int mt7601u_register_device(struct mt7601u_dev *dev)
if (ret)
return ret;
+#ifdef CONFIG_DEBUG_FS
mt7601u_init_debugfs(dev);
+#endif
return 0;
}
diff --git a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
index a122f1dd38f6..c5f06818bb35 100644
--- a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
+++ b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
@@ -242,6 +242,9 @@ struct mt7601u_dev {
u32 rf_pa_mode[2];
struct mac_stats stats;
+#ifdef CONFIG_DEBUG_FS
+ struct dentry *root_dir;
+#endif
};
struct mt7601u_tssi_params {
@@ -279,6 +282,7 @@ struct mt7601u_rxwi;
extern const struct ieee80211_ops mt7601u_ops;
void mt7601u_init_debugfs(struct mt7601u_dev *dev);
+void mt7601u_exit_debugfs(struct mt7601u_dev *dev);
u32 mt7601u_rr(struct mt7601u_dev *dev, u32 offset);
void mt7601u_wr(struct mt7601u_dev *dev, u32 offset, u32 val);
--
2.33.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] mediatek/mt7601u: add debugfs exit function
2022-04-22 7:03 ` Bernard Zhao
(?)
@ 2022-04-22 7:45 ` Kalle Valo
-1 siblings, 0 replies; 12+ messages in thread
From: Kalle Valo @ 2022-04-22 7:45 UTC (permalink / raw)
To: Bernard Zhao
Cc: Jakub Kicinski, David S. Miller, Paolo Abeni, Matthias Brugger,
linux-wireless, netdev, linux-arm-kernel, linux-mediatek,
linux-kernel, bernard
Bernard Zhao <zhaojunkui2008@126.com> writes:
> When mt7601u loaded, there are two cases:
> First when mt7601u is loaded, in function mt7601u_probe, if
> function mt7601u_probe run into error lable err_hw,
> mt7601u_cleanup didn`t cleanup the debugfs node.
> Second when the module disconnect, in function mt7601u_disconnect,
> mt7601u_cleanup didn`t cleanup the debugfs node.
> This patch add debugfs exit function and try to cleanup debugfs
> node when mt7601u loaded fail or unloaded.
>
> Signed-off-by: Bernard Zhao <zhaojunkui2008@126.com>
> ---
> .../net/wireless/mediatek/mt7601u/debugfs.c | 25 +++++++++++--------
> drivers/net/wireless/mediatek/mt7601u/init.c | 5 ++++
> .../net/wireless/mediatek/mt7601u/mt7601u.h | 4 +++
> 3 files changed, 24 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt7601u/debugfs.c b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
> index 20669eacb66e..1ae3d75d3c9b 100644
> --- a/drivers/net/wireless/mediatek/mt7601u/debugfs.c
> +++ b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
> @@ -124,17 +124,22 @@ DEFINE_SHOW_ATTRIBUTE(mt7601u_eeprom_param);
>
> void mt7601u_init_debugfs(struct mt7601u_dev *dev)
> {
> - struct dentry *dir;
> -
> - dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
> - if (!dir)
> + dev->root_dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
> + if (!dev->root_dir)
> return;
>
> - debugfs_create_u8("temperature", 0400, dir, &dev->raw_temp);
> - debugfs_create_u32("temp_mode", 0400, dir, &dev->temp_mode);
> + debugfs_create_u8("temperature", 0400, dev->root_dir, &dev->raw_temp);
> + debugfs_create_u32("temp_mode", 0400, dev->root_dir, &dev->temp_mode);
> +
> + debugfs_create_u32("regidx", 0600, dev->root_dir, &dev->debugfs_reg);
> + debugfs_create_file("regval", 0600, dev->root_dir, dev, &fops_regval);
> + debugfs_create_file("ampdu_stat", 0400, dev->root_dir, dev, &mt7601u_ampdu_stat_fops);
> + debugfs_create_file("eeprom_param", 0400, dev->root_dir, dev, &mt7601u_eeprom_param_fops);
> +}
>
> - debugfs_create_u32("regidx", 0600, dir, &dev->debugfs_reg);
> - debugfs_create_file("regval", 0600, dir, dev, &fops_regval);
> - debugfs_create_file("ampdu_stat", 0400, dir, dev, &mt7601u_ampdu_stat_fops);
> - debugfs_create_file("eeprom_param", 0400, dir, dev, &mt7601u_eeprom_param_fops);
> +void mt7601u_exit_debugfs(struct mt7601u_dev *dev)
> +{
> + if (!dev->root_dir)
> + return;
> + debugfs_remove(dev->root_dir);
debugfs_remove() has IS_ERR_OR_NULL() check, so no need to check for
null here.
> }
> diff --git a/drivers/net/wireless/mediatek/mt7601u/init.c b/drivers/net/wireless/mediatek/mt7601u/init.c
> index 5d9e952b2966..1e905ef2ed19 100644
> --- a/drivers/net/wireless/mediatek/mt7601u/init.c
> +++ b/drivers/net/wireless/mediatek/mt7601u/init.c
> @@ -427,6 +427,9 @@ void mt7601u_cleanup(struct mt7601u_dev *dev)
> mt7601u_stop_hardware(dev);
> mt7601u_dma_cleanup(dev);
> mt7601u_mcu_cmd_deinit(dev);
> +#ifdef CONFIG_DEBUG_FS
> + mt7601u_exit_debugfs(dev);
> +#endif
> }
>
> struct mt7601u_dev *mt7601u_alloc_device(struct device *pdev)
> @@ -625,7 +628,9 @@ int mt7601u_register_device(struct mt7601u_dev *dev)
> if (ret)
> return ret;
>
> +#ifdef CONFIG_DEBUG_FS
> mt7601u_init_debugfs(dev);
> +#endif
Are these two ifdefs really needed? debugfs functions are empty
functions when CONFIG_DEBUG_FS is disabled.
> --- a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
> +++ b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
> @@ -242,6 +242,9 @@ struct mt7601u_dev {
> u32 rf_pa_mode[2];
>
> struct mac_stats stats;
> +#ifdef CONFIG_DEBUG_FS
> + struct dentry *root_dir;
> +#endif
I would remove this ifdef, it's just saving one pointer size. Less
ifdefs we have the better.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] mediatek/mt7601u: add debugfs exit function
@ 2022-04-22 7:45 ` Kalle Valo
0 siblings, 0 replies; 12+ messages in thread
From: Kalle Valo @ 2022-04-22 7:45 UTC (permalink / raw)
To: Bernard Zhao
Cc: Jakub Kicinski, David S. Miller, Paolo Abeni, Matthias Brugger,
linux-wireless, netdev, linux-arm-kernel, linux-mediatek,
linux-kernel, bernard
Bernard Zhao <zhaojunkui2008@126.com> writes:
> When mt7601u loaded, there are two cases:
> First when mt7601u is loaded, in function mt7601u_probe, if
> function mt7601u_probe run into error lable err_hw,
> mt7601u_cleanup didn`t cleanup the debugfs node.
> Second when the module disconnect, in function mt7601u_disconnect,
> mt7601u_cleanup didn`t cleanup the debugfs node.
> This patch add debugfs exit function and try to cleanup debugfs
> node when mt7601u loaded fail or unloaded.
>
> Signed-off-by: Bernard Zhao <zhaojunkui2008@126.com>
> ---
> .../net/wireless/mediatek/mt7601u/debugfs.c | 25 +++++++++++--------
> drivers/net/wireless/mediatek/mt7601u/init.c | 5 ++++
> .../net/wireless/mediatek/mt7601u/mt7601u.h | 4 +++
> 3 files changed, 24 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt7601u/debugfs.c b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
> index 20669eacb66e..1ae3d75d3c9b 100644
> --- a/drivers/net/wireless/mediatek/mt7601u/debugfs.c
> +++ b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
> @@ -124,17 +124,22 @@ DEFINE_SHOW_ATTRIBUTE(mt7601u_eeprom_param);
>
> void mt7601u_init_debugfs(struct mt7601u_dev *dev)
> {
> - struct dentry *dir;
> -
> - dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
> - if (!dir)
> + dev->root_dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
> + if (!dev->root_dir)
> return;
>
> - debugfs_create_u8("temperature", 0400, dir, &dev->raw_temp);
> - debugfs_create_u32("temp_mode", 0400, dir, &dev->temp_mode);
> + debugfs_create_u8("temperature", 0400, dev->root_dir, &dev->raw_temp);
> + debugfs_create_u32("temp_mode", 0400, dev->root_dir, &dev->temp_mode);
> +
> + debugfs_create_u32("regidx", 0600, dev->root_dir, &dev->debugfs_reg);
> + debugfs_create_file("regval", 0600, dev->root_dir, dev, &fops_regval);
> + debugfs_create_file("ampdu_stat", 0400, dev->root_dir, dev, &mt7601u_ampdu_stat_fops);
> + debugfs_create_file("eeprom_param", 0400, dev->root_dir, dev, &mt7601u_eeprom_param_fops);
> +}
>
> - debugfs_create_u32("regidx", 0600, dir, &dev->debugfs_reg);
> - debugfs_create_file("regval", 0600, dir, dev, &fops_regval);
> - debugfs_create_file("ampdu_stat", 0400, dir, dev, &mt7601u_ampdu_stat_fops);
> - debugfs_create_file("eeprom_param", 0400, dir, dev, &mt7601u_eeprom_param_fops);
> +void mt7601u_exit_debugfs(struct mt7601u_dev *dev)
> +{
> + if (!dev->root_dir)
> + return;
> + debugfs_remove(dev->root_dir);
debugfs_remove() has IS_ERR_OR_NULL() check, so no need to check for
null here.
> }
> diff --git a/drivers/net/wireless/mediatek/mt7601u/init.c b/drivers/net/wireless/mediatek/mt7601u/init.c
> index 5d9e952b2966..1e905ef2ed19 100644
> --- a/drivers/net/wireless/mediatek/mt7601u/init.c
> +++ b/drivers/net/wireless/mediatek/mt7601u/init.c
> @@ -427,6 +427,9 @@ void mt7601u_cleanup(struct mt7601u_dev *dev)
> mt7601u_stop_hardware(dev);
> mt7601u_dma_cleanup(dev);
> mt7601u_mcu_cmd_deinit(dev);
> +#ifdef CONFIG_DEBUG_FS
> + mt7601u_exit_debugfs(dev);
> +#endif
> }
>
> struct mt7601u_dev *mt7601u_alloc_device(struct device *pdev)
> @@ -625,7 +628,9 @@ int mt7601u_register_device(struct mt7601u_dev *dev)
> if (ret)
> return ret;
>
> +#ifdef CONFIG_DEBUG_FS
> mt7601u_init_debugfs(dev);
> +#endif
Are these two ifdefs really needed? debugfs functions are empty
functions when CONFIG_DEBUG_FS is disabled.
> --- a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
> +++ b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
> @@ -242,6 +242,9 @@ struct mt7601u_dev {
> u32 rf_pa_mode[2];
>
> struct mac_stats stats;
> +#ifdef CONFIG_DEBUG_FS
> + struct dentry *root_dir;
> +#endif
I would remove this ifdef, it's just saving one pointer size. Less
ifdefs we have the better.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] mediatek/mt7601u: add debugfs exit function
@ 2022-04-22 7:45 ` Kalle Valo
0 siblings, 0 replies; 12+ messages in thread
From: Kalle Valo @ 2022-04-22 7:45 UTC (permalink / raw)
To: Bernard Zhao
Cc: Jakub Kicinski, David S. Miller, Paolo Abeni, Matthias Brugger,
linux-wireless, netdev, linux-arm-kernel, linux-mediatek,
linux-kernel, bernard
Bernard Zhao <zhaojunkui2008@126.com> writes:
> When mt7601u loaded, there are two cases:
> First when mt7601u is loaded, in function mt7601u_probe, if
> function mt7601u_probe run into error lable err_hw,
> mt7601u_cleanup didn`t cleanup the debugfs node.
> Second when the module disconnect, in function mt7601u_disconnect,
> mt7601u_cleanup didn`t cleanup the debugfs node.
> This patch add debugfs exit function and try to cleanup debugfs
> node when mt7601u loaded fail or unloaded.
>
> Signed-off-by: Bernard Zhao <zhaojunkui2008@126.com>
> ---
> .../net/wireless/mediatek/mt7601u/debugfs.c | 25 +++++++++++--------
> drivers/net/wireless/mediatek/mt7601u/init.c | 5 ++++
> .../net/wireless/mediatek/mt7601u/mt7601u.h | 4 +++
> 3 files changed, 24 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt7601u/debugfs.c b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
> index 20669eacb66e..1ae3d75d3c9b 100644
> --- a/drivers/net/wireless/mediatek/mt7601u/debugfs.c
> +++ b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
> @@ -124,17 +124,22 @@ DEFINE_SHOW_ATTRIBUTE(mt7601u_eeprom_param);
>
> void mt7601u_init_debugfs(struct mt7601u_dev *dev)
> {
> - struct dentry *dir;
> -
> - dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
> - if (!dir)
> + dev->root_dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
> + if (!dev->root_dir)
> return;
>
> - debugfs_create_u8("temperature", 0400, dir, &dev->raw_temp);
> - debugfs_create_u32("temp_mode", 0400, dir, &dev->temp_mode);
> + debugfs_create_u8("temperature", 0400, dev->root_dir, &dev->raw_temp);
> + debugfs_create_u32("temp_mode", 0400, dev->root_dir, &dev->temp_mode);
> +
> + debugfs_create_u32("regidx", 0600, dev->root_dir, &dev->debugfs_reg);
> + debugfs_create_file("regval", 0600, dev->root_dir, dev, &fops_regval);
> + debugfs_create_file("ampdu_stat", 0400, dev->root_dir, dev, &mt7601u_ampdu_stat_fops);
> + debugfs_create_file("eeprom_param", 0400, dev->root_dir, dev, &mt7601u_eeprom_param_fops);
> +}
>
> - debugfs_create_u32("regidx", 0600, dir, &dev->debugfs_reg);
> - debugfs_create_file("regval", 0600, dir, dev, &fops_regval);
> - debugfs_create_file("ampdu_stat", 0400, dir, dev, &mt7601u_ampdu_stat_fops);
> - debugfs_create_file("eeprom_param", 0400, dir, dev, &mt7601u_eeprom_param_fops);
> +void mt7601u_exit_debugfs(struct mt7601u_dev *dev)
> +{
> + if (!dev->root_dir)
> + return;
> + debugfs_remove(dev->root_dir);
debugfs_remove() has IS_ERR_OR_NULL() check, so no need to check for
null here.
> }
> diff --git a/drivers/net/wireless/mediatek/mt7601u/init.c b/drivers/net/wireless/mediatek/mt7601u/init.c
> index 5d9e952b2966..1e905ef2ed19 100644
> --- a/drivers/net/wireless/mediatek/mt7601u/init.c
> +++ b/drivers/net/wireless/mediatek/mt7601u/init.c
> @@ -427,6 +427,9 @@ void mt7601u_cleanup(struct mt7601u_dev *dev)
> mt7601u_stop_hardware(dev);
> mt7601u_dma_cleanup(dev);
> mt7601u_mcu_cmd_deinit(dev);
> +#ifdef CONFIG_DEBUG_FS
> + mt7601u_exit_debugfs(dev);
> +#endif
> }
>
> struct mt7601u_dev *mt7601u_alloc_device(struct device *pdev)
> @@ -625,7 +628,9 @@ int mt7601u_register_device(struct mt7601u_dev *dev)
> if (ret)
> return ret;
>
> +#ifdef CONFIG_DEBUG_FS
> mt7601u_init_debugfs(dev);
> +#endif
Are these two ifdefs really needed? debugfs functions are empty
functions when CONFIG_DEBUG_FS is disabled.
> --- a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
> +++ b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
> @@ -242,6 +242,9 @@ struct mt7601u_dev {
> u32 rf_pa_mode[2];
>
> struct mac_stats stats;
> +#ifdef CONFIG_DEBUG_FS
> + struct dentry *root_dir;
> +#endif
I would remove this ifdef, it's just saving one pointer size. Less
ifdefs we have the better.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re:Re: [PATCH] mediatek/mt7601u: add debugfs exit function
2022-04-22 7:45 ` Kalle Valo
(?)
@ 2022-04-22 7:58 ` z
-1 siblings, 0 replies; 12+ messages in thread
From: z @ 2022-04-22 7:58 UTC (permalink / raw)
To: Kalle Valo
Cc: Jakub Kicinski, David S. Miller, Paolo Abeni, Matthias Brugger,
linux-wireless, netdev, linux-arm-kernel, linux-mediatek,
linux-kernel, bernard
HI Kalle Valo:
At 2022-04-22 15:45:57, "Kalle Valo" <kvalo@kernel.org> wrote:
>Bernard Zhao <zhaojunkui2008@126.com> writes:
>
>> When mt7601u loaded, there are two cases:
>> First when mt7601u is loaded, in function mt7601u_probe, if
>> function mt7601u_probe run into error lable err_hw,
>> mt7601u_cleanup didn`t cleanup the debugfs node.
>> Second when the module disconnect, in function mt7601u_disconnect,
>> mt7601u_cleanup didn`t cleanup the debugfs node.
>> This patch add debugfs exit function and try to cleanup debugfs
>> node when mt7601u loaded fail or unloaded.
>>
>> Signed-off-by: Bernard Zhao <zhaojunkui2008@126.com>
>> ---
>> .../net/wireless/mediatek/mt7601u/debugfs.c | 25 +++++++++++--------
>> drivers/net/wireless/mediatek/mt7601u/init.c | 5 ++++
>> .../net/wireless/mediatek/mt7601u/mt7601u.h | 4 +++
>> 3 files changed, 24 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/net/wireless/mediatek/mt7601u/debugfs.c b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
>> index 20669eacb66e..1ae3d75d3c9b 100644
>> --- a/drivers/net/wireless/mediatek/mt7601u/debugfs.c
>> +++ b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
>> @@ -124,17 +124,22 @@ DEFINE_SHOW_ATTRIBUTE(mt7601u_eeprom_param);
>>
>> void mt7601u_init_debugfs(struct mt7601u_dev *dev)
>> {
>> - struct dentry *dir;
>> -
>> - dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
>> - if (!dir)
>> + dev->root_dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
>> + if (!dev->root_dir)
>> return;
>>
>> - debugfs_create_u8("temperature", 0400, dir, &dev->raw_temp);
>> - debugfs_create_u32("temp_mode", 0400, dir, &dev->temp_mode);
>> + debugfs_create_u8("temperature", 0400, dev->root_dir, &dev->raw_temp);
>> + debugfs_create_u32("temp_mode", 0400, dev->root_dir, &dev->temp_mode);
>> +
>> + debugfs_create_u32("regidx", 0600, dev->root_dir, &dev->debugfs_reg);
>> + debugfs_create_file("regval", 0600, dev->root_dir, dev, &fops_regval);
>> + debugfs_create_file("ampdu_stat", 0400, dev->root_dir, dev, &mt7601u_ampdu_stat_fops);
>> + debugfs_create_file("eeprom_param", 0400, dev->root_dir, dev, &mt7601u_eeprom_param_fops);
>> +}
>>
>> - debugfs_create_u32("regidx", 0600, dir, &dev->debugfs_reg);
>> - debugfs_create_file("regval", 0600, dir, dev, &fops_regval);
>> - debugfs_create_file("ampdu_stat", 0400, dir, dev, &mt7601u_ampdu_stat_fops);
>> - debugfs_create_file("eeprom_param", 0400, dir, dev, &mt7601u_eeprom_param_fops);
>> +void mt7601u_exit_debugfs(struct mt7601u_dev *dev)
>> +{
>> + if (!dev->root_dir)
>> + return;
>> + debugfs_remove(dev->root_dir);
>
>debugfs_remove() has IS_ERR_OR_NULL() check, so no need to check for
>null here.
Got it, thanks!
>> }
>> diff --git a/drivers/net/wireless/mediatek/mt7601u/init.c b/drivers/net/wireless/mediatek/mt7601u/init.c
>> index 5d9e952b2966..1e905ef2ed19 100644
>> --- a/drivers/net/wireless/mediatek/mt7601u/init.c
>> +++ b/drivers/net/wireless/mediatek/mt7601u/init.c
>> @@ -427,6 +427,9 @@ void mt7601u_cleanup(struct mt7601u_dev *dev)
>> mt7601u_stop_hardware(dev);
>> mt7601u_dma_cleanup(dev);
>> mt7601u_mcu_cmd_deinit(dev);
>> +#ifdef CONFIG_DEBUG_FS
>> + mt7601u_exit_debugfs(dev);
>> +#endif
>> }
>>
>> struct mt7601u_dev *mt7601u_alloc_device(struct device *pdev)
>> @@ -625,7 +628,9 @@ int mt7601u_register_device(struct mt7601u_dev *dev)
>> if (ret)
>> return ret;
>>
>> +#ifdef CONFIG_DEBUG_FS
>> mt7601u_init_debugfs(dev);
>> +#endif
>
>Are these two ifdefs really needed? debugfs functions are empty
>functions when CONFIG_DEBUG_FS is disabled.
Ifdef doesn't seem to make much sense, thanks for your advice!
>> --- a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
>> +++ b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
>> @@ -242,6 +242,9 @@ struct mt7601u_dev {
>> u32 rf_pa_mode[2];
>>
>> struct mac_stats stats;
>> +#ifdef CONFIG_DEBUG_FS
>> + struct dentry *root_dir;
>> +#endif
>
>I would remove this ifdef, it's just saving one pointer size. Less
>ifdefs we have the better.
I would modify the code and resubmit a patch, thank you very much!
BR//Bernard
>--
>https://patchwork.kernel.org/project/linux-wireless/list/
>
>https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re:Re: [PATCH] mediatek/mt7601u: add debugfs exit function
@ 2022-04-22 7:58 ` z
0 siblings, 0 replies; 12+ messages in thread
From: z @ 2022-04-22 7:58 UTC (permalink / raw)
To: Kalle Valo
Cc: Jakub Kicinski, David S. Miller, Paolo Abeni, Matthias Brugger,
linux-wireless, netdev, linux-arm-kernel, linux-mediatek,
linux-kernel, bernard
HI Kalle Valo:
At 2022-04-22 15:45:57, "Kalle Valo" <kvalo@kernel.org> wrote:
>Bernard Zhao <zhaojunkui2008@126.com> writes:
>
>> When mt7601u loaded, there are two cases:
>> First when mt7601u is loaded, in function mt7601u_probe, if
>> function mt7601u_probe run into error lable err_hw,
>> mt7601u_cleanup didn`t cleanup the debugfs node.
>> Second when the module disconnect, in function mt7601u_disconnect,
>> mt7601u_cleanup didn`t cleanup the debugfs node.
>> This patch add debugfs exit function and try to cleanup debugfs
>> node when mt7601u loaded fail or unloaded.
>>
>> Signed-off-by: Bernard Zhao <zhaojunkui2008@126.com>
>> ---
>> .../net/wireless/mediatek/mt7601u/debugfs.c | 25 +++++++++++--------
>> drivers/net/wireless/mediatek/mt7601u/init.c | 5 ++++
>> .../net/wireless/mediatek/mt7601u/mt7601u.h | 4 +++
>> 3 files changed, 24 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/net/wireless/mediatek/mt7601u/debugfs.c b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
>> index 20669eacb66e..1ae3d75d3c9b 100644
>> --- a/drivers/net/wireless/mediatek/mt7601u/debugfs.c
>> +++ b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
>> @@ -124,17 +124,22 @@ DEFINE_SHOW_ATTRIBUTE(mt7601u_eeprom_param);
>>
>> void mt7601u_init_debugfs(struct mt7601u_dev *dev)
>> {
>> - struct dentry *dir;
>> -
>> - dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
>> - if (!dir)
>> + dev->root_dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
>> + if (!dev->root_dir)
>> return;
>>
>> - debugfs_create_u8("temperature", 0400, dir, &dev->raw_temp);
>> - debugfs_create_u32("temp_mode", 0400, dir, &dev->temp_mode);
>> + debugfs_create_u8("temperature", 0400, dev->root_dir, &dev->raw_temp);
>> + debugfs_create_u32("temp_mode", 0400, dev->root_dir, &dev->temp_mode);
>> +
>> + debugfs_create_u32("regidx", 0600, dev->root_dir, &dev->debugfs_reg);
>> + debugfs_create_file("regval", 0600, dev->root_dir, dev, &fops_regval);
>> + debugfs_create_file("ampdu_stat", 0400, dev->root_dir, dev, &mt7601u_ampdu_stat_fops);
>> + debugfs_create_file("eeprom_param", 0400, dev->root_dir, dev, &mt7601u_eeprom_param_fops);
>> +}
>>
>> - debugfs_create_u32("regidx", 0600, dir, &dev->debugfs_reg);
>> - debugfs_create_file("regval", 0600, dir, dev, &fops_regval);
>> - debugfs_create_file("ampdu_stat", 0400, dir, dev, &mt7601u_ampdu_stat_fops);
>> - debugfs_create_file("eeprom_param", 0400, dir, dev, &mt7601u_eeprom_param_fops);
>> +void mt7601u_exit_debugfs(struct mt7601u_dev *dev)
>> +{
>> + if (!dev->root_dir)
>> + return;
>> + debugfs_remove(dev->root_dir);
>
>debugfs_remove() has IS_ERR_OR_NULL() check, so no need to check for
>null here.
Got it, thanks!
>> }
>> diff --git a/drivers/net/wireless/mediatek/mt7601u/init.c b/drivers/net/wireless/mediatek/mt7601u/init.c
>> index 5d9e952b2966..1e905ef2ed19 100644
>> --- a/drivers/net/wireless/mediatek/mt7601u/init.c
>> +++ b/drivers/net/wireless/mediatek/mt7601u/init.c
>> @@ -427,6 +427,9 @@ void mt7601u_cleanup(struct mt7601u_dev *dev)
>> mt7601u_stop_hardware(dev);
>> mt7601u_dma_cleanup(dev);
>> mt7601u_mcu_cmd_deinit(dev);
>> +#ifdef CONFIG_DEBUG_FS
>> + mt7601u_exit_debugfs(dev);
>> +#endif
>> }
>>
>> struct mt7601u_dev *mt7601u_alloc_device(struct device *pdev)
>> @@ -625,7 +628,9 @@ int mt7601u_register_device(struct mt7601u_dev *dev)
>> if (ret)
>> return ret;
>>
>> +#ifdef CONFIG_DEBUG_FS
>> mt7601u_init_debugfs(dev);
>> +#endif
>
>Are these two ifdefs really needed? debugfs functions are empty
>functions when CONFIG_DEBUG_FS is disabled.
Ifdef doesn't seem to make much sense, thanks for your advice!
>> --- a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
>> +++ b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
>> @@ -242,6 +242,9 @@ struct mt7601u_dev {
>> u32 rf_pa_mode[2];
>>
>> struct mac_stats stats;
>> +#ifdef CONFIG_DEBUG_FS
>> + struct dentry *root_dir;
>> +#endif
>
>I would remove this ifdef, it's just saving one pointer size. Less
>ifdefs we have the better.
I would modify the code and resubmit a patch, thank you very much!
BR//Bernard
>--
>https://patchwork.kernel.org/project/linux-wireless/list/
>
>https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re:Re: [PATCH] mediatek/mt7601u: add debugfs exit function
@ 2022-04-22 7:58 ` z
0 siblings, 0 replies; 12+ messages in thread
From: z @ 2022-04-22 7:58 UTC (permalink / raw)
To: Kalle Valo
Cc: Jakub Kicinski, David S. Miller, Paolo Abeni, Matthias Brugger,
linux-wireless, netdev, linux-arm-kernel, linux-mediatek,
linux-kernel, bernard
HI Kalle Valo:
At 2022-04-22 15:45:57, "Kalle Valo" <kvalo@kernel.org> wrote:
>Bernard Zhao <zhaojunkui2008@126.com> writes:
>
>> When mt7601u loaded, there are two cases:
>> First when mt7601u is loaded, in function mt7601u_probe, if
>> function mt7601u_probe run into error lable err_hw,
>> mt7601u_cleanup didn`t cleanup the debugfs node.
>> Second when the module disconnect, in function mt7601u_disconnect,
>> mt7601u_cleanup didn`t cleanup the debugfs node.
>> This patch add debugfs exit function and try to cleanup debugfs
>> node when mt7601u loaded fail or unloaded.
>>
>> Signed-off-by: Bernard Zhao <zhaojunkui2008@126.com>
>> ---
>> .../net/wireless/mediatek/mt7601u/debugfs.c | 25 +++++++++++--------
>> drivers/net/wireless/mediatek/mt7601u/init.c | 5 ++++
>> .../net/wireless/mediatek/mt7601u/mt7601u.h | 4 +++
>> 3 files changed, 24 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/net/wireless/mediatek/mt7601u/debugfs.c b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
>> index 20669eacb66e..1ae3d75d3c9b 100644
>> --- a/drivers/net/wireless/mediatek/mt7601u/debugfs.c
>> +++ b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
>> @@ -124,17 +124,22 @@ DEFINE_SHOW_ATTRIBUTE(mt7601u_eeprom_param);
>>
>> void mt7601u_init_debugfs(struct mt7601u_dev *dev)
>> {
>> - struct dentry *dir;
>> -
>> - dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
>> - if (!dir)
>> + dev->root_dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
>> + if (!dev->root_dir)
>> return;
>>
>> - debugfs_create_u8("temperature", 0400, dir, &dev->raw_temp);
>> - debugfs_create_u32("temp_mode", 0400, dir, &dev->temp_mode);
>> + debugfs_create_u8("temperature", 0400, dev->root_dir, &dev->raw_temp);
>> + debugfs_create_u32("temp_mode", 0400, dev->root_dir, &dev->temp_mode);
>> +
>> + debugfs_create_u32("regidx", 0600, dev->root_dir, &dev->debugfs_reg);
>> + debugfs_create_file("regval", 0600, dev->root_dir, dev, &fops_regval);
>> + debugfs_create_file("ampdu_stat", 0400, dev->root_dir, dev, &mt7601u_ampdu_stat_fops);
>> + debugfs_create_file("eeprom_param", 0400, dev->root_dir, dev, &mt7601u_eeprom_param_fops);
>> +}
>>
>> - debugfs_create_u32("regidx", 0600, dir, &dev->debugfs_reg);
>> - debugfs_create_file("regval", 0600, dir, dev, &fops_regval);
>> - debugfs_create_file("ampdu_stat", 0400, dir, dev, &mt7601u_ampdu_stat_fops);
>> - debugfs_create_file("eeprom_param", 0400, dir, dev, &mt7601u_eeprom_param_fops);
>> +void mt7601u_exit_debugfs(struct mt7601u_dev *dev)
>> +{
>> + if (!dev->root_dir)
>> + return;
>> + debugfs_remove(dev->root_dir);
>
>debugfs_remove() has IS_ERR_OR_NULL() check, so no need to check for
>null here.
Got it, thanks!
>> }
>> diff --git a/drivers/net/wireless/mediatek/mt7601u/init.c b/drivers/net/wireless/mediatek/mt7601u/init.c
>> index 5d9e952b2966..1e905ef2ed19 100644
>> --- a/drivers/net/wireless/mediatek/mt7601u/init.c
>> +++ b/drivers/net/wireless/mediatek/mt7601u/init.c
>> @@ -427,6 +427,9 @@ void mt7601u_cleanup(struct mt7601u_dev *dev)
>> mt7601u_stop_hardware(dev);
>> mt7601u_dma_cleanup(dev);
>> mt7601u_mcu_cmd_deinit(dev);
>> +#ifdef CONFIG_DEBUG_FS
>> + mt7601u_exit_debugfs(dev);
>> +#endif
>> }
>>
>> struct mt7601u_dev *mt7601u_alloc_device(struct device *pdev)
>> @@ -625,7 +628,9 @@ int mt7601u_register_device(struct mt7601u_dev *dev)
>> if (ret)
>> return ret;
>>
>> +#ifdef CONFIG_DEBUG_FS
>> mt7601u_init_debugfs(dev);
>> +#endif
>
>Are these two ifdefs really needed? debugfs functions are empty
>functions when CONFIG_DEBUG_FS is disabled.
Ifdef doesn't seem to make much sense, thanks for your advice!
>> --- a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
>> +++ b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h
>> @@ -242,6 +242,9 @@ struct mt7601u_dev {
>> u32 rf_pa_mode[2];
>>
>> struct mac_stats stats;
>> +#ifdef CONFIG_DEBUG_FS
>> + struct dentry *root_dir;
>> +#endif
>
>I would remove this ifdef, it's just saving one pointer size. Less
>ifdefs we have the better.
I would modify the code and resubmit a patch, thank you very much!
BR//Bernard
>--
>https://patchwork.kernel.org/project/linux-wireless/list/
>
>https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] mediatek/mt7601u: add debugfs exit function
2022-04-22 7:45 ` Kalle Valo
(?)
@ 2022-04-22 12:49 ` Jakub Kicinski
-1 siblings, 0 replies; 12+ messages in thread
From: Jakub Kicinski @ 2022-04-22 12:49 UTC (permalink / raw)
To: Kalle Valo
Cc: Bernard Zhao, David S. Miller, Paolo Abeni, Matthias Brugger,
linux-wireless, netdev, linux-arm-kernel, linux-mediatek,
linux-kernel, bernard
On Fri, 22 Apr 2022 10:45:57 +0300 Kalle Valo wrote:
> > When mt7601u loaded, there are two cases:
> > First when mt7601u is loaded, in function mt7601u_probe, if
> > function mt7601u_probe run into error lable err_hw,
> > mt7601u_cleanup didn`t cleanup the debugfs node.
> > Second when the module disconnect, in function mt7601u_disconnect,
> > mt7601u_cleanup didn`t cleanup the debugfs node.
> > This patch add debugfs exit function and try to cleanup debugfs
> > node when mt7601u loaded fail or unloaded.
Is this actually needed? Looks like wireless has a wiphy debugfs dir
now, so the entire thing should get removed recursively when probe
fails. The driver is not doing anything special.
> > diff --git a/drivers/net/wireless/mediatek/mt7601u/debugfs.c b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
> > index 20669eacb66e..1ae3d75d3c9b 100644
> > --- a/drivers/net/wireless/mediatek/mt7601u/debugfs.c
> > +++ b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
> > @@ -124,17 +124,22 @@ DEFINE_SHOW_ATTRIBUTE(mt7601u_eeprom_param);
> >
> > void mt7601u_init_debugfs(struct mt7601u_dev *dev)
> > {
> > - struct dentry *dir;
> > -
> > - dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
> > - if (!dir)
> > + dev->root_dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
> > + if (!dev->root_dir)
> > return;
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] mediatek/mt7601u: add debugfs exit function
@ 2022-04-22 12:49 ` Jakub Kicinski
0 siblings, 0 replies; 12+ messages in thread
From: Jakub Kicinski @ 2022-04-22 12:49 UTC (permalink / raw)
To: Kalle Valo
Cc: Bernard Zhao, David S. Miller, Paolo Abeni, Matthias Brugger,
linux-wireless, netdev, linux-arm-kernel, linux-mediatek,
linux-kernel, bernard
On Fri, 22 Apr 2022 10:45:57 +0300 Kalle Valo wrote:
> > When mt7601u loaded, there are two cases:
> > First when mt7601u is loaded, in function mt7601u_probe, if
> > function mt7601u_probe run into error lable err_hw,
> > mt7601u_cleanup didn`t cleanup the debugfs node.
> > Second when the module disconnect, in function mt7601u_disconnect,
> > mt7601u_cleanup didn`t cleanup the debugfs node.
> > This patch add debugfs exit function and try to cleanup debugfs
> > node when mt7601u loaded fail or unloaded.
Is this actually needed? Looks like wireless has a wiphy debugfs dir
now, so the entire thing should get removed recursively when probe
fails. The driver is not doing anything special.
> > diff --git a/drivers/net/wireless/mediatek/mt7601u/debugfs.c b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
> > index 20669eacb66e..1ae3d75d3c9b 100644
> > --- a/drivers/net/wireless/mediatek/mt7601u/debugfs.c
> > +++ b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
> > @@ -124,17 +124,22 @@ DEFINE_SHOW_ATTRIBUTE(mt7601u_eeprom_param);
> >
> > void mt7601u_init_debugfs(struct mt7601u_dev *dev)
> > {
> > - struct dentry *dir;
> > -
> > - dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
> > - if (!dir)
> > + dev->root_dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
> > + if (!dev->root_dir)
> > return;
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] mediatek/mt7601u: add debugfs exit function
@ 2022-04-22 12:49 ` Jakub Kicinski
0 siblings, 0 replies; 12+ messages in thread
From: Jakub Kicinski @ 2022-04-22 12:49 UTC (permalink / raw)
To: Kalle Valo
Cc: Bernard Zhao, David S. Miller, Paolo Abeni, Matthias Brugger,
linux-wireless, netdev, linux-arm-kernel, linux-mediatek,
linux-kernel, bernard
On Fri, 22 Apr 2022 10:45:57 +0300 Kalle Valo wrote:
> > When mt7601u loaded, there are two cases:
> > First when mt7601u is loaded, in function mt7601u_probe, if
> > function mt7601u_probe run into error lable err_hw,
> > mt7601u_cleanup didn`t cleanup the debugfs node.
> > Second when the module disconnect, in function mt7601u_disconnect,
> > mt7601u_cleanup didn`t cleanup the debugfs node.
> > This patch add debugfs exit function and try to cleanup debugfs
> > node when mt7601u loaded fail or unloaded.
Is this actually needed? Looks like wireless has a wiphy debugfs dir
now, so the entire thing should get removed recursively when probe
fails. The driver is not doing anything special.
> > diff --git a/drivers/net/wireless/mediatek/mt7601u/debugfs.c b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
> > index 20669eacb66e..1ae3d75d3c9b 100644
> > --- a/drivers/net/wireless/mediatek/mt7601u/debugfs.c
> > +++ b/drivers/net/wireless/mediatek/mt7601u/debugfs.c
> > @@ -124,17 +124,22 @@ DEFINE_SHOW_ATTRIBUTE(mt7601u_eeprom_param);
> >
> > void mt7601u_init_debugfs(struct mt7601u_dev *dev)
> > {
> > - struct dentry *dir;
> > -
> > - dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
> > - if (!dir)
> > + dev->root_dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir);
> > + if (!dev->root_dir)
> > return;
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2022-04-22 12:56 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-22 7:03 [PATCH] mediatek/mt7601u: add debugfs exit function Bernard Zhao
2022-04-22 7:03 ` Bernard Zhao
2022-04-22 7:03 ` Bernard Zhao
2022-04-22 7:45 ` Kalle Valo
2022-04-22 7:45 ` Kalle Valo
2022-04-22 7:45 ` Kalle Valo
2022-04-22 7:58 ` z
2022-04-22 7:58 ` z
2022-04-22 7:58 ` z
2022-04-22 12:49 ` Jakub Kicinski
2022-04-22 12:49 ` Jakub Kicinski
2022-04-22 12:49 ` Jakub Kicinski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.