[PATCH v3 4/4] staging/rtl8712 : Remove duplicated BIT() definitions

Anish Bhatt anish7 at gmail.com
Wed Sep 9 22:57:10 UTC 2015


The BIT() macro is already defined in bitops.h,
remove duplicate definitions.

Signed-off-by: Anish Bhatt <anish at chelsio.com>
---
 drivers/staging/rtl8712/osdep_service.h | 4 ----
 drivers/staging/rtl8712/wifi.h          | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h
index 0a7f58c..076d508 100644
--- a/drivers/staging/rtl8712/osdep_service.h
+++ b/drivers/staging/rtl8712/osdep_service.h
@@ -60,10 +60,6 @@ struct	__queue	{
 #define LIST_CONTAINOR(ptr, type, member) \
 	((type *)((char *)(ptr)-(SIZE_T)(&((type *)0)->member)))
 
-#ifndef BIT
-	#define BIT(x)	(1 << (x))
-#endif
-
 static inline u32 _down_sema(struct semaphore *sema)
 {
 	if (down_interruptible(sema))
diff --git a/drivers/staging/rtl8712/wifi.h b/drivers/staging/rtl8712/wifi.h
index 67c6ebf..7a352c4 100644
--- a/drivers/staging/rtl8712/wifi.h
+++ b/drivers/staging/rtl8712/wifi.h
@@ -28,11 +28,6 @@
 
 #include <linux/compiler.h>
 
-#ifdef BIT
-#undef BIT
-#endif
-#define BIT(x)	(1 << (x))
-
 #define WLAN_IEEE_OUI_LEN	3
 #define WLAN_CRC_LEN		4
 #define WLAN_BSSID_LEN		6
-- 
2.5.1



More information about the devel mailing list