* [RFC] ath5k: Move debugfs under ieee80211/[wiphy-name]
@ 2010-10-11 19:20 greearb
2010-10-12 1:37 ` Bruno Randolf
2010-10-12 8:03 ` Johannes Berg
0 siblings, 2 replies; 4+ messages in thread
From: greearb @ 2010-10-11 19:20 UTC (permalink / raw)
To: linux-wireless; +Cc: Ben Greear
From: Ben Greear <greearb@candelatech.com>
This automatically keeps things proper when wiphy
is renamed.
Based on patch by Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
:100644 100644 c9732a6... 032c2ee... M drivers/net/wireless/ath/ath5k/base.c
:100644 100644 a342a9d... 673ab83... M drivers/net/wireless/ath/ath5k/debug.c
drivers/net/wireless/ath/ath5k/base.c | 3 +--
drivers/net/wireless/ath/ath5k/debug.c | 8 ++------
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index c9732a6..032c2ee 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -3543,8 +3543,6 @@ ath5k_pci_probe(struct pci_dev *pdev,
sc->hw = hw;
sc->pdev = pdev;
- ath5k_debug_init_device(sc);
-
/*
* Mark the device as detached to avoid processing
* interrupts until setup is complete.
@@ -3652,6 +3650,7 @@ ath5k_pci_probe(struct pci_dev *pdev,
}
}
+ ath5k_debug_init_device(sc);
/* ready to process interrupts */
__clear_bit(ATH_STAT_INVALID, sc->status);
diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
index a342a9d..673ab83 100644
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@ -72,8 +72,6 @@ module_param_named(debug, ath5k_debug, uint, 0);
#include "reg.h"
#include "ani.h"
-static struct dentry *ath5k_global_debugfs;
-
static int ath5k_debugfs_open(struct inode *inode, struct file *file)
{
file->private_data = inode->i_private;
@@ -894,7 +892,6 @@ static const struct file_operations fops_queue = {
void
ath5k_debug_init(void)
{
- ath5k_global_debugfs = debugfs_create_dir("ath5k", NULL);
}
void
@@ -902,8 +899,8 @@ ath5k_debug_init_device(struct ath5k_softc *sc)
{
sc->debug.level = ath5k_debug;
- sc->debug.debugfs_phydir = debugfs_create_dir(wiphy_name(sc->hw->wiphy),
- ath5k_global_debugfs);
+ sc->debug.debugfs_phydir = debugfs_create_dir("ath5k",
+ sc->hw->wiphy->debugfsdir);
sc->debug.debugfs_debug = debugfs_create_file("debug",
S_IWUSR | S_IRUSR,
@@ -946,7 +943,6 @@ ath5k_debug_init_device(struct ath5k_softc *sc)
void
ath5k_debug_finish(void)
{
- debugfs_remove(ath5k_global_debugfs);
}
void
--
1.7.2.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [RFC] ath5k: Move debugfs under ieee80211/[wiphy-name]
2010-10-11 19:20 [RFC] ath5k: Move debugfs under ieee80211/[wiphy-name] greearb
@ 2010-10-12 1:37 ` Bruno Randolf
2010-10-12 8:03 ` Johannes Berg
1 sibling, 0 replies; 4+ messages in thread
From: Bruno Randolf @ 2010-10-12 1:37 UTC (permalink / raw)
To: greearb; +Cc: linux-wireless
On Tue October 12 2010 04:20:41 greearb@candelatech.com wrote:
> From: Ben Greear <greearb@candelatech.com>
>
> This automatically keeps things proper when wiphy
> is renamed.
>
> Based on patch by Johannes Berg <johannes@sipsolutions.net>
>
> Signed-off-by: Ben Greear <greearb@candelatech.com>
> ---
>
> :100644 100644 c9732a6... 032c2ee...
> :M drivers/net/wireless/ath/ath5k/base.c 100644 100644 a342a9d...
> :673ab83... M drivers/net/wireless/ath/ath5k/debug.c
>
> drivers/net/wireless/ath/ath5k/base.c | 3 +--
> drivers/net/wireless/ath/ath5k/debug.c | 8 ++------
> 2 files changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath5k/base.c
> b/drivers/net/wireless/ath/ath5k/base.c index c9732a6..032c2ee 100644
> --- a/drivers/net/wireless/ath/ath5k/base.c
> +++ b/drivers/net/wireless/ath/ath5k/base.c
> @@ -3543,8 +3543,6 @@ ath5k_pci_probe(struct pci_dev *pdev,
> sc->hw = hw;
> sc->pdev = pdev;
>
> - ath5k_debug_init_device(sc);
> -
> /*
> * Mark the device as detached to avoid processing
> * interrupts until setup is complete.
> @@ -3652,6 +3650,7 @@ ath5k_pci_probe(struct pci_dev *pdev,
> }
> }
>
> + ath5k_debug_init_device(sc);
>
> /* ready to process interrupts */
> __clear_bit(ATH_STAT_INVALID, sc->status);
> diff --git a/drivers/net/wireless/ath/ath5k/debug.c
> b/drivers/net/wireless/ath/ath5k/debug.c index a342a9d..673ab83 100644
> --- a/drivers/net/wireless/ath/ath5k/debug.c
> +++ b/drivers/net/wireless/ath/ath5k/debug.c
> @@ -72,8 +72,6 @@ module_param_named(debug, ath5k_debug, uint, 0);
> #include "reg.h"
> #include "ani.h"
>
> -static struct dentry *ath5k_global_debugfs;
> -
> static int ath5k_debugfs_open(struct inode *inode, struct file *file)
> {
> file->private_data = inode->i_private;
> @@ -894,7 +892,6 @@ static const struct file_operations fops_queue = {
> void
> ath5k_debug_init(void)
> {
> - ath5k_global_debugfs = debugfs_create_dir("ath5k", NULL);
> }
>
> void
> @@ -902,8 +899,8 @@ ath5k_debug_init_device(struct ath5k_softc *sc)
> {
> sc->debug.level = ath5k_debug;
>
> - sc->debug.debugfs_phydir = debugfs_create_dir(wiphy_name(sc->hw->wiphy),
> - ath5k_global_debugfs);
> + sc->debug.debugfs_phydir = debugfs_create_dir("ath5k",
> + sc->hw->wiphy->debugfsdir);
>
> sc->debug.debugfs_debug = debugfs_create_file("debug",
> S_IWUSR | S_IRUSR,
> @@ -946,7 +943,6 @@ ath5k_debug_init_device(struct ath5k_softc *sc)
> void
> ath5k_debug_finish(void)
> {
> - debugfs_remove(ath5k_global_debugfs);
> }
>
> void
Acked-by: Bruno Randolf <br1@einfach.org>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [RFC] ath5k: Move debugfs under ieee80211/[wiphy-name]
2010-10-11 19:20 [RFC] ath5k: Move debugfs under ieee80211/[wiphy-name] greearb
2010-10-12 1:37 ` Bruno Randolf
@ 2010-10-12 8:03 ` Johannes Berg
2010-10-12 15:35 ` Ben Greear
1 sibling, 1 reply; 4+ messages in thread
From: Johannes Berg @ 2010-10-12 8:03 UTC (permalink / raw)
To: greearb; +Cc: linux-wireless
On Mon, 2010-10-11 at 12:20 -0700, greearb@candelatech.com wrote:
> void
> ath5k_debug_init(void)
> {
> - ath5k_global_debugfs = debugfs_create_dir("ath5k", NULL);
> }
I didn't really intend for my patch to get merged -- at least you should
also remove this now useless function and its callers and prototypes.
johannes
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [RFC] ath5k: Move debugfs under ieee80211/[wiphy-name]
2010-10-12 8:03 ` Johannes Berg
@ 2010-10-12 15:35 ` Ben Greear
0 siblings, 0 replies; 4+ messages in thread
From: Ben Greear @ 2010-10-12 15:35 UTC (permalink / raw)
To: Johannes Berg; +Cc: linux-wireless
On 10/12/2010 01:03 AM, Johannes Berg wrote:
> On Mon, 2010-10-11 at 12:20 -0700, greearb@candelatech.com wrote:
>
>> void
>> ath5k_debug_init(void)
>> {
>> - ath5k_global_debugfs = debugfs_create_dir("ath5k", NULL);
>> }
>
> I didn't really intend for my patch to get merged -- at least you should
> also remove this now useless function and its callers and prototypes.
I'll send an updated patch later today.
Thanks,
Ben
>
> johannes
--
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc http://www.candelatech.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-10-12 15:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-11 19:20 [RFC] ath5k: Move debugfs under ieee80211/[wiphy-name] greearb
2010-10-12 1:37 ` Bruno Randolf
2010-10-12 8:03 ` Johannes Berg
2010-10-12 15:35 ` Ben Greear
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).