staging: Final semaphore cleanup

[net-next-2.6.git] / drivers / staging / rtl8712 / osdep_service.h

diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h
index 73509dad21070de428577f33bc729f88bfdabfa3..d1674cd282dcd7deb370cca6b75c8f0f69b3ed73 100644 (file)
--- a/drivers/staging/rtl8712/osdep_service.h
+++ b/drivers/staging/rtl8712/osdep_service.h
@@ -161,7 +161,7 @@ static inline u32 _down_sema(struct semaphore *sema)
 
 static inline void _rtl_rwlock_init(struct semaphore *prwlock)
 {
-       init_MUTEX(prwlock);
+       sema_init(prwlock, 1);
 }
 
 static inline void _init_listhead(struct list_head *list)
@@ -251,9 +251,6 @@ static inline u32 _RND512(u32 sz)
        return val;
 }
 
-#define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
-#define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x"
-
 #define STRUCT_PACKED __attribute__ ((packed))
 
 #endif