On Tue October 12 2010 04:20:41 greearb@xxxxxxxxxxxxxxx wrote:
> From: Ben Greear <greearb@xxxxxxxxxxxxxxx>
>
> This automatically keeps things proper when wiphy
> is renamed.
>
> Based on patch by Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
>
> Signed-off-by: Ben Greear <greearb@xxxxxxxxxxxxxxx>
> ---
>
> :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@xxxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
