summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrett Rudley <brudley@broadcom.com>2010-12-01 15:36:38 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-02 12:28:48 -0800
commitdf880a42dc4086ba7ff16f6ccb255e78fc0dc374 (patch)
treed5cb3e6f8b14b9a09ff3e9170660a45d751d6d41
parentbafbb8df076de1e3b63914473a403fba96b88f3c (diff)
staging: brcm80211: Remove unused code from osl.h
Signed-off-by: Brett Rudley <brudley@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/brcm80211/include/osl.h16
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/staging/brcm80211/include/osl.h b/drivers/staging/brcm80211/include/osl.h
index 662b5197b374..c2fa2975c955 100644
--- a/drivers/staging/brcm80211/include/osl.h
+++ b/drivers/staging/brcm80211/include/osl.h
@@ -38,22 +38,10 @@ typedef struct osl_dmainfo osldma_t;
typedef unsigned int (*osl_rreg_fn_t) (void *ctx, void *reg, unsigned int size);
typedef void (*osl_wreg_fn_t) (void *ctx, void *reg, unsigned int val,
unsigned int size);
-#endif
+#endif /* BCMSDIO */
#include <linux_osl.h>
-/* --------------------------------------------------------------------------
-** Register manipulation macros.
-*/
-
#define SET_REG(osh, r, mask, val) W_REG((osh), (r), ((R_REG((osh), r) & ~(mask)) | (val)))
-#ifndef AND_REG
-#define AND_REG(osh, r, v) W_REG(osh, (r), R_REG(osh, r) & (v))
-#endif /* !AND_REG */
-
-#ifndef OR_REG
-#define OR_REG(osh, r, v) W_REG(osh, (r), R_REG(osh, r) | (v))
-#endif /* !OR_REG */
-
-#endif /* _osl_h_ */
+#endif /* _osl_h_ */