ath9k: add some minor debugfs cleanups

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26247 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 111 insertions, 4 deletions

diff --git a/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch b/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch
index 0bb7082ef..632ae96a6 100644
--- a/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch
+++ b/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch
@@ -54,13 +54,12 @@
  int ath9k_init_debug(struct ath_hw *ah)
  {
  	struct ath_common *common = ath9k_hw_common(ah);
-@@ -1151,6 +1198,10 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -1151,6 +1198,9 @@ int ath9k_init_debug(struct ath_hw *ah)
  	debugfs_create_u32("gpio_val", S_IRUSR | S_IWUSR,
  			   sc->debug.debugfs_phy, &sc->sc_ah->gpio_val);
  
-+	if (!debugfs_create_file("eeprom", S_IRUSR,
-+			sc->debug.debugfs_phy, sc, &fops_eeprom))
-+		goto err;
++	debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
++			    &fops_eeprom);
 +
  	sc->debug.regidx = 0;
  	return 0;
diff --git a/package/mac80211/patches/560-ath9k_debugfs_cleanup.patch b/package/mac80211/patches/560-ath9k_debugfs_cleanup.patch
new file mode 100644
index 000000000..70e7ac536
--- /dev/null
+++ b/package/mac80211/patches/560-ath9k_debugfs_cleanup.patch
@@ -0,0 +1,108 @@
+--- a/drivers/net/wireless/ath/ath9k/debug.c
++++ b/drivers/net/wireless/ath/ath9k/debug.c
+@@ -1135,76 +1135,43 @@ int ath9k_init_debug(struct ath_hw *ah)
+ 		return -ENOMEM;
+ 
+ #ifdef CONFIG_ATH_DEBUG
+-	if (!debugfs_create_file("debug", S_IRUSR | S_IWUSR,
+-			sc->debug.debugfs_phy, sc, &fops_debug))
+-		goto err;
++	debugfs_create_file("debug", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
++			    sc, &fops_debug);
+ #endif
+-
+-	if (!debugfs_create_file("dma", S_IRUSR, sc->debug.debugfs_phy,
+-			sc, &fops_dma))
+-		goto err;
+-
+-	if (!debugfs_create_file("interrupt", S_IRUSR, sc->debug.debugfs_phy,
+-			sc, &fops_interrupt))
+-		goto err;
+-
+-	if (!debugfs_create_file("wiphy", S_IRUSR | S_IWUSR,
+-			sc->debug.debugfs_phy, sc, &fops_wiphy))
+-		goto err;
+-
+-	if (!debugfs_create_file("xmit", S_IRUSR, sc->debug.debugfs_phy,
+-			sc, &fops_xmit))
+-		goto err;
+-
+-	if (!debugfs_create_file("stations", S_IRUSR, sc->debug.debugfs_phy,
+-			sc, &fops_stations))
+-		goto err;
+-
+-	if (!debugfs_create_file("misc", S_IRUSR, sc->debug.debugfs_phy,
+-			sc, &fops_misc))
+-		goto err;
+-
+-	if (!debugfs_create_file("recv", S_IRUSR, sc->debug.debugfs_phy,
+-			sc, &fops_recv))
+-		goto err;
+-
+-	if (!debugfs_create_file("rx_chainmask", S_IRUSR | S_IWUSR,
+-			sc->debug.debugfs_phy, sc, &fops_rx_chainmask))
+-		goto err;
+-
+-	if (!debugfs_create_file("tx_chainmask", S_IRUSR | S_IWUSR,
+-			sc->debug.debugfs_phy, sc, &fops_tx_chainmask))
+-		goto err;
+-
+-	if (!debugfs_create_file("regidx", S_IRUSR | S_IWUSR,
+-			sc->debug.debugfs_phy, sc, &fops_regidx))
+-		goto err;
+-
+-	if (!debugfs_create_file("regval", S_IRUSR | S_IWUSR,
+-			sc->debug.debugfs_phy, sc, &fops_regval))
+-		goto err;
+-
+-	if (!debugfs_create_bool("ignore_extcca", S_IRUSR | S_IWUSR,
+-			sc->debug.debugfs_phy, &ah->config.cwm_ignore_extcca))
+-		goto err;
+-
+-	if (!debugfs_create_file("regdump", S_IRUSR, sc->debug.debugfs_phy,
+-			sc, &fops_regdump))
+-		goto err;
+-
++	debugfs_create_file("dma", S_IRUSR, sc->debug.debugfs_phy, sc,
++			    &fops_dma);
++	debugfs_create_file("interrupt", S_IRUSR, sc->debug.debugfs_phy, sc,
++			    &fops_interrupt);
++	debugfs_create_file("wiphy", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
++			    sc, &fops_wiphy);
++	debugfs_create_file("xmit", S_IRUSR, sc->debug.debugfs_phy, sc,
++			    &fops_xmit);
++	debugfs_create_file("stations", S_IRUSR, sc->debug.debugfs_phy, sc,
++			    &fops_stations);
++	debugfs_create_file("misc", S_IRUSR, sc->debug.debugfs_phy, sc,
++			    &fops_misc);
++	debugfs_create_file("recv", S_IRUSR, sc->debug.debugfs_phy, sc,
++			    &fops_recv);
++	debugfs_create_file("rx_chainmask", S_IRUSR | S_IWUSR,
++			    sc->debug.debugfs_phy, sc, &fops_rx_chainmask);
++	debugfs_create_file("tx_chainmask", S_IRUSR | S_IWUSR,
++			    sc->debug.debugfs_phy, sc, &fops_tx_chainmask);
++	debugfs_create_file("regidx", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
++			    sc, &fops_regidx);
++	debugfs_create_file("regval", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
++			    sc, &fops_regval);
++	debugfs_create_bool("ignore_extcca", S_IRUSR | S_IWUSR,
++			    sc->debug.debugfs_phy,
++			    &ah->config.cwm_ignore_extcca);
++	debugfs_create_file("regdump", S_IRUSR, sc->debug.debugfs_phy, sc,
++			    &fops_regdump);
+ 	debugfs_create_u32("gpio_mask", S_IRUSR | S_IWUSR,
+ 			   sc->debug.debugfs_phy, &sc->sc_ah->gpio_mask);
+-
+ 	debugfs_create_u32("gpio_val", S_IRUSR | S_IWUSR,
+ 			   sc->debug.debugfs_phy, &sc->sc_ah->gpio_val);
+-
+ 	debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
+ 			    &fops_eeprom);
+ 
+ 	sc->debug.regidx = 0;
+ 	return 0;
+-err:
+-	debugfs_remove_recursive(sc->debug.debugfs_phy);
+-	sc->debug.debugfs_phy = NULL;
+-	return -ENOMEM;
+ }