ath9k: fix sparse complaint on aphy for debugfs
authorLuis R. Rodriguez <lrodriguez@atheros.com>
Fri, 15 Oct 2010 20:27:49 +0000 (13:27 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 9 Nov 2010 21:13:25 +0000 (16:13 -0500)
This fixes this sparse complaint:

  CHECK   drivers/net/wireless/ath/ath9k/debug.c
drivers/net/wireless/ath/ath9k/debug.c:548:34: warning: symbol 'aphy' shadows an earlier one
drivers/net/wireless/ath/ath9k/debug.c:491:26: originally declared here

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/debug.c

index 43e71a944cb17331340e2460b9f0fae79323e9da..a4052711eca8bbe827d77cbd5ae0531e464bbc91 100644 (file)
@@ -461,16 +461,16 @@ static ssize_t read_file_wiphy(struct file *file, char __user *user_buf,
 
        /* Put variable-length stuff down here, and check for overflows. */
        for (i = 0; i < sc->num_sec_wiphy; i++) {
-               struct ath_wiphy *aphy = sc->sec_wiphy[i];
-               if (aphy == NULL)
+               struct ath_wiphy *aphy_tmp = sc->sec_wiphy[i];
+               if (aphy_tmp == NULL)
                        continue;
-               chan = aphy->hw->conf.channel;
+               chan = aphy_tmp->hw->conf.channel;
                len += snprintf(buf + len, sizeof(buf) - len,
                        "secondary: %s (%s chan=%d ht=%d)\n",
-                       wiphy_name(aphy->hw->wiphy),
-                       ath_wiphy_state_str(aphy->state),
+                       wiphy_name(aphy_tmp->hw->wiphy),
+                       ath_wiphy_state_str(aphy_tmp->state),
                        ieee80211_frequency_to_channel(chan->center_freq),
-                       aphy->chan_is_ht);
+                                                      aphy_tmp->chan_is_ht);
        }
        if (len > sizeof(buf))
                len = sizeof(buf);