From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail30t.wh2.ocn.ne.jp ([125.206.180.136]:49287 "HELO mail30t.wh2.ocn.ne.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755583Ab0JLBhA (ORCPT ); Mon, 11 Oct 2010 21:37:00 -0400 Received: from vs3001.wh2.ocn.ne.jp (125.206.180.229) by mail30t.wh2.ocn.ne.jp (RS ver 1.0.95vs) with SMTP id 3-0635167417 for ; Tue, 12 Oct 2010 10:36:58 +0900 (JST) From: Bruno Randolf To: greearb@candelatech.com Subject: Re: [RFC] ath5k: Move debugfs under ieee80211/[wiphy-name] Date: Tue, 12 Oct 2010 10:37:06 +0900 Cc: linux-wireless@vger.kernel.org References: <1286824841-30822-1-git-send-email-greearb@candelatech.com> In-Reply-To: <1286824841-30822-1-git-send-email-greearb@candelatech.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Message-Id: <201010121037.06841.br1@einfach.org> Sender: linux-wireless-owner@vger.kernel.org List-ID: On Tue October 12 2010 04:20:41 greearb@candelatech.com wrote: > From: Ben Greear > > This automatically keeps things proper when wiphy > is renamed. > > Based on patch by Johannes Berg > > Signed-off-by: Ben Greear > --- > > :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