ath9k: merge a fix for queue start/stop handling (fixes #18164, #18130)
[oweals/openwrt.git] / package / kernel / mac80211 / patches / 329-ath9k-clean-up-debugfs-print-of-reset-causes.patch
1 From: Felix Fietkau <nbd@openwrt.org>
2 Date: Sat, 18 Oct 2014 13:36:41 +0200
3 Subject: [PATCH] ath9k: clean up debugfs print of reset causes
4
5 Reduce code duplication
6
7 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
8 ---
9
10 --- a/drivers/net/wireless/ath/ath9k/debug.c
11 +++ b/drivers/net/wireless/ath/ath9k/debug.c
12 @@ -852,36 +852,30 @@ static ssize_t read_file_reset(struct fi
13                                size_t count, loff_t *ppos)
14  {
15         struct ath_softc *sc = file->private_data;
16 +       static const char * const reset_cause[__RESET_TYPE_MAX] = {
17 +               [RESET_TYPE_BB_HANG] = "Baseband Hang",
18 +               [RESET_TYPE_BB_WATCHDOG] = "Baseband Watchdog",
19 +               [RESET_TYPE_FATAL_INT] = "Fatal HW Error",
20 +               [RESET_TYPE_TX_ERROR] = "TX HW error",
21 +               [RESET_TYPE_TX_GTT] = "Transmit timeout",
22 +               [RESET_TYPE_TX_HANG] = "TX Path Hang",
23 +               [RESET_TYPE_PLL_HANG] = "PLL RX Hang",
24 +               [RESET_TYPE_MAC_HANG] = "MAC Hang",
25 +               [RESET_TYPE_BEACON_STUCK] = "Stuck Beacon",
26 +               [RESET_TYPE_MCI] = "MCI Reset",
27 +       };
28         char buf[512];
29         unsigned int len = 0;
30 +       int i;
31  
32 -       len += scnprintf(buf + len, sizeof(buf) - len,
33 -                        "%17s: %2d\n", "Baseband Hang",
34 -                        sc->debug.stats.reset[RESET_TYPE_BB_HANG]);
35 -       len += scnprintf(buf + len, sizeof(buf) - len,
36 -                        "%17s: %2d\n", "Baseband Watchdog",
37 -                        sc->debug.stats.reset[RESET_TYPE_BB_WATCHDOG]);
38 -       len += scnprintf(buf + len, sizeof(buf) - len,
39 -                        "%17s: %2d\n", "Fatal HW Error",
40 -                        sc->debug.stats.reset[RESET_TYPE_FATAL_INT]);
41 -       len += scnprintf(buf + len, sizeof(buf) - len,
42 -                        "%17s: %2d\n", "TX HW error",
43 -                        sc->debug.stats.reset[RESET_TYPE_TX_ERROR]);
44 -       len += scnprintf(buf + len, sizeof(buf) - len,
45 -                        "%17s: %2d\n", "TX Path Hang",
46 -                        sc->debug.stats.reset[RESET_TYPE_TX_HANG]);
47 -       len += scnprintf(buf + len, sizeof(buf) - len,
48 -                        "%17s: %2d\n", "PLL RX Hang",
49 -                        sc->debug.stats.reset[RESET_TYPE_PLL_HANG]);
50 -       len += scnprintf(buf + len, sizeof(buf) - len,
51 -                        "%17s: %2d\n", "MAC Hang",
52 -                        sc->debug.stats.reset[RESET_TYPE_MAC_HANG]);
53 -       len += scnprintf(buf + len, sizeof(buf) - len,
54 -                        "%17s: %2d\n", "Stuck Beacon",
55 -                        sc->debug.stats.reset[RESET_TYPE_BEACON_STUCK]);
56 -       len += scnprintf(buf + len, sizeof(buf) - len,
57 -                        "%17s: %2d\n", "MCI Reset",
58 -                        sc->debug.stats.reset[RESET_TYPE_MCI]);
59 +       for (i = 0; i < ARRAY_SIZE(reset_cause); i++) {
60 +               if (!reset_cause[i])
61 +                   continue;
62 +
63 +               len += scnprintf(buf + len, sizeof(buf) - len,
64 +                                "%17s: %2d\n", reset_cause[i],
65 +                                sc->debug.stats.reset[i]);
66 +       }
67  
68         if (len > sizeof(buf))
69                 len = sizeof(buf);