summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
authorskrll <skrll@NetBSD.org>2013-10-22 13:04:25 +0000
committerskrll <skrll@NetBSD.org>2013-10-22 13:04:25 +0000
commitb7542dace2da707f151e60956f991bfdd956e63d (patch)
treebf3b1f81c384cc40bda1c2f390ba70fd883e3b0b /sys/dev/ic
parent6b62961e72c5d1536c2aeb5650e96195612cdfaa (diff)
Avoid "declaration of 'delay' shadows a global declaration" by renaming
the local variable.
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/arn5008.c14
-rw-r--r--sys/dev/ic/arn9003.c14
2 files changed, 14 insertions, 14 deletions
diff --git a/sys/dev/ic/arn5008.c b/sys/dev/ic/arn5008.c
index 2bff5181f7b..27ca717f7c7 100644
--- a/sys/dev/ic/arn5008.c
+++ b/sys/dev/ic/arn5008.c
@@ -1,4 +1,4 @@
-/* $NetBSD: arn5008.c,v 1.4 2013/10/17 21:24:24 christos Exp $ */
+/* $NetBSD: arn5008.c,v 1.5 2013/10/22 13:04:25 skrll Exp $ */
/* $OpenBSD: ar5008.c,v 1.21 2012/08/25 12:14:31 kettenis Exp $ */
/*-
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arn5008.c,v 1.4 2013/10/17 21:24:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arn5008.c,v 1.5 2013/10/22 13:04:25 skrll Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -1661,14 +1661,14 @@ ar5008_set_rf_mode(struct athn_softc *sc, struct ieee80211_channel *c)
static __inline uint32_t
ar5008_synth_delay(struct athn_softc *sc)
{
- uint32_t delay;
+ uint32_t synth_delay;
- delay = MS(AR_READ(sc, AR_PHY_RX_DELAY), AR_PHY_RX_DELAY_DELAY);
+ synth_delay = MS(AR_READ(sc, AR_PHY_RX_DELAY), AR_PHY_RX_DELAY_DELAY);
if (sc->sc_ic.ic_curmode == IEEE80211_MODE_11B)
- delay = (delay * 4) / 22;
+ synth_delay = (synth_delay * 4) / 22;
else
- delay = delay / 10; /* in 100ns steps */
- return delay;
+ synth_delay = synth_delay / 10; /* in 100ns steps */
+ return synth_delay;
}
Static int
diff --git a/sys/dev/ic/arn9003.c b/sys/dev/ic/arn9003.c
index fdb9b40f61b..8eb64014fb4 100644
--- a/sys/dev/ic/arn9003.c
+++ b/sys/dev/ic/arn9003.c
@@ -1,4 +1,4 @@
-/* $NetBSD: arn9003.c,v 1.4 2013/10/17 21:24:24 christos Exp $ */
+/* $NetBSD: arn9003.c,v 1.5 2013/10/22 13:04:25 skrll Exp $ */
/* $OpenBSD: ar9003.c,v 1.25 2012/10/20 09:53:32 stsp Exp $ */
/*-
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arn9003.c,v 1.4 2013/10/17 21:24:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arn9003.c,v 1.5 2013/10/22 13:04:25 skrll Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -1840,14 +1840,14 @@ ar9003_set_rf_mode(struct athn_softc *sc, struct ieee80211_channel *c)
static __inline uint32_t
ar9003_synth_delay(struct athn_softc *sc)
{
- uint32_t delay;
+ uint32_t synth_delay;
- delay = MS(AR_READ(sc, AR_PHY_RX_DELAY), AR_PHY_RX_DELAY_DELAY);
+ synth_delay = MS(AR_READ(sc, AR_PHY_RX_DELAY), AR_PHY_RX_DELAY_DELAY);
if (sc->sc_ic.ic_curmode == IEEE80211_MODE_11B)
- delay = (delay * 4) / 22;
+ synth_delay = (synth_delay * 4) / 22;
else
- delay = delay / 10; /* in 100ns steps */
- return delay;
+ synth_delay = synth_delay / 10; /* in 100ns steps */
+ return synth_delay;
}
Static int