1 --- a/drivers/net/wireless/ath/ath9k/debug.c
2 +++ b/drivers/net/wireless/ath/ath9k/debug.c
3 @@ -1135,76 +1135,43 @@ int ath9k_init_debug(struct ath_hw *ah)
6 #ifdef CONFIG_ATH_DEBUG
7 - if (!debugfs_create_file("debug", S_IRUSR | S_IWUSR,
8 - sc->debug.debugfs_phy, sc, &fops_debug))
10 + debugfs_create_file("debug", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
14 - if (!debugfs_create_file("dma", S_IRUSR, sc->debug.debugfs_phy,
18 - if (!debugfs_create_file("interrupt", S_IRUSR, sc->debug.debugfs_phy,
19 - sc, &fops_interrupt))
22 - if (!debugfs_create_file("wiphy", S_IRUSR | S_IWUSR,
23 - sc->debug.debugfs_phy, sc, &fops_wiphy))
26 - if (!debugfs_create_file("xmit", S_IRUSR, sc->debug.debugfs_phy,
30 - if (!debugfs_create_file("stations", S_IRUSR, sc->debug.debugfs_phy,
31 - sc, &fops_stations))
34 - if (!debugfs_create_file("misc", S_IRUSR, sc->debug.debugfs_phy,
38 - if (!debugfs_create_file("recv", S_IRUSR, sc->debug.debugfs_phy,
42 - if (!debugfs_create_file("rx_chainmask", S_IRUSR | S_IWUSR,
43 - sc->debug.debugfs_phy, sc, &fops_rx_chainmask))
46 - if (!debugfs_create_file("tx_chainmask", S_IRUSR | S_IWUSR,
47 - sc->debug.debugfs_phy, sc, &fops_tx_chainmask))
50 - if (!debugfs_create_file("regidx", S_IRUSR | S_IWUSR,
51 - sc->debug.debugfs_phy, sc, &fops_regidx))
54 - if (!debugfs_create_file("regval", S_IRUSR | S_IWUSR,
55 - sc->debug.debugfs_phy, sc, &fops_regval))
58 - if (!debugfs_create_bool("ignore_extcca", S_IRUSR | S_IWUSR,
59 - sc->debug.debugfs_phy, &ah->config.cwm_ignore_extcca))
62 - if (!debugfs_create_file("regdump", S_IRUSR, sc->debug.debugfs_phy,
66 + debugfs_create_file("dma", S_IRUSR, sc->debug.debugfs_phy, sc,
68 + debugfs_create_file("interrupt", S_IRUSR, sc->debug.debugfs_phy, sc,
70 + debugfs_create_file("wiphy", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
72 + debugfs_create_file("xmit", S_IRUSR, sc->debug.debugfs_phy, sc,
74 + debugfs_create_file("stations", S_IRUSR, sc->debug.debugfs_phy, sc,
76 + debugfs_create_file("misc", S_IRUSR, sc->debug.debugfs_phy, sc,
78 + debugfs_create_file("recv", S_IRUSR, sc->debug.debugfs_phy, sc,
80 + debugfs_create_file("rx_chainmask", S_IRUSR | S_IWUSR,
81 + sc->debug.debugfs_phy, sc, &fops_rx_chainmask);
82 + debugfs_create_file("tx_chainmask", S_IRUSR | S_IWUSR,
83 + sc->debug.debugfs_phy, sc, &fops_tx_chainmask);
84 + debugfs_create_file("regidx", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
86 + debugfs_create_file("regval", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
88 + debugfs_create_bool("ignore_extcca", S_IRUSR | S_IWUSR,
89 + sc->debug.debugfs_phy,
90 + &ah->config.cwm_ignore_extcca);
91 + debugfs_create_file("regdump", S_IRUSR, sc->debug.debugfs_phy, sc,
93 debugfs_create_u32("gpio_mask", S_IRUSR | S_IWUSR,
94 sc->debug.debugfs_phy, &sc->sc_ah->gpio_mask);
96 debugfs_create_u32("gpio_val", S_IRUSR | S_IWUSR,
97 sc->debug.debugfs_phy, &sc->sc_ah->gpio_val);
99 debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
102 sc->debug.regidx = 0;
105 - debugfs_remove_recursive(sc->debug.debugfs_phy);
106 - sc->debug.debugfs_phy = NULL;