From: Anish Bhatt <anish7@gmail.com>
Date: Wed, 9 Sep 2015 22:57:10 +0000 (-0700)
Subject: staging/rtl8712 : Remove duplicated BIT() definitions
X-Git-Tag: firefly_0821_release~176^2~802^2~2102
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4c021dc0b8722365e9aee06d7a2213b5d93075c7;p=firefly-linux-kernel-4.4.55.git

staging/rtl8712 : Remove duplicated BIT() definitions

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

Signed-off-by: Anish Bhatt <anish@chelsio.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h
index 0a7f58c59df5..076d5083c723 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 67c6ebfaa1bb..7a352c45344f 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