1 files changed, 35 insertions, 59 deletions

diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
index 8df5a92a20f..a762cadb3ab 100644
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -1088,67 +1088,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);
 
         sc->debug.regidx = 0;
         return 0;
-err:
-        debugfs_remove_recursive(sc->debug.debugfs_phy);
-        sc->debug.debugfs_phy = NULL;
-        return -ENOMEM;
 }