staging: brcm80211: migrate register ops macros to bcmutils.h

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/include/bcmutils.h b/drivers/staging/brcm80211/include/bcmutils.h
index 3628fd6a997bc79b0d2047e2b25c974b01c5260d..a8f76d8199ff6ebcdc9d8f3b45815759ee2fba8f 100644 (file)
--- 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 b066f14734686d7c9092448c9f6542c294959b0c..c99920b52e9deb813843668a89e6b6fce19293b3 100644 (file)
--- 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_ */