From: Brett Rudley <brud...@broadcom.com>
Signed-off-by: Brett Rudley <brud...@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>
---
drivers/staging/brcm80211/include/bcmutils.h | 8 +++++++-
drivers/staging/brcm80211/include/osl.h | 6 ------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/brcm80211/include/bcmutils.h
b/drivers/staging/brcm80211/include/bcmutils.h
index 3628fd6..a8f76d8 100644
--- a/drivers/staging/brcm80211/include/bcmutils.h
+++ b/drivers/staging/brcm80211/include/bcmutils.h
@@ -369,7 +369,13 @@ extern struct sk_buff *pktq_mdeq(struct pktq *pq, uint
prec_bmp, int *prec_out);
#define REG_MAP(pa, size) (void *)(0)
#endif
-/* bit map related macros */
+/* Register operations */
+#define AND_REG(osh, r, v) W_REG(osh, (r), R_REG(osh, r) & (v))
+#define OR_REG(osh, r, v) W_REG(osh, (r), R_REG(osh, r) | (v))
+
+#define SET_REG(osh, r, mask, val) \
+ W_REG((osh), (r), ((R_REG((osh), r) & ~(mask)) | (val)))
+
#ifndef setbit
#ifndef NBBY /* the BSD family defines NBBY */
#define NBBY 8 /* 8 bits per byte */
diff --git a/drivers/staging/brcm80211/include/osl.h
b/drivers/staging/brcm80211/include/osl.h
index b066f14..c99920b 100644
--- a/drivers/staging/brcm80211/include/osl.h
+++ b/drivers/staging/brcm80211/include/osl.h
@@ -214,9 +214,6 @@ extern void osl_dma_unmap(struct osl_info *osh, uint pa,
uint size,
} while (0)
#endif /* IL_BIGENDIAN */
-#define AND_REG(osh, r, v) W_REG(osh, (r), R_REG(osh, r) &
(v))
-#define OR_REG(osh, r, v) W_REG(osh, (r), R_REG(osh, r) |
(v))
-
#define bcopy(src, dst, len) memcpy((dst), (src), (len))
/* packet primitives */
@@ -226,7 +223,4 @@ extern void osl_dma_unmap(struct osl_info *osh, uint pa,
uint size,
extern void *osl_pktget(struct osl_info *osh, uint len);
extern void osl_pktfree(struct osl_info *osh, void *skb, bool send);
-#define SET_REG(osh, r, mask, val) \
- W_REG((osh), (r), ((R_REG((osh), r) & ~(mask)) | (val)))
-
#endif /* _osl_h_ */
--
1.7.3.2
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
