staging, rt2860: Remove unnecessary casts of void ptr returning alloc function return...

[pandora-kernel.git] / drivers / staging / rt2860 / common / ba_action.c

diff --git a/drivers/staging/rt2860/common/ba_action.c b/drivers/staging/rt2860/common/ba_action.c
index 174f2a7..ed8854b 100644 (file)
--- a/drivers/staging/rt2860/common/ba_action.c
+++ b/drivers/staging/rt2860/common/ba_action.c
@@ -26,6 +26,7 @@
  */
 
 #include "../rt_config.h"
+#include <linux/kernel.h>
 
 #define BA_ORI_INIT_SEQ                (pEntry->TxSeq[TID])    /*1                        // inital sequence number of BA session */
 
@@ -654,8 +655,8 @@ BOOLEAN BARecSessionAdd(struct rt_rtmp_adapter *pAd,
        } else {
                Status = FALSE;
                DBGPRINT(RT_DEBUG_TRACE,
-                        ("Can't Accept ADDBA for %02x:%02x:%02x:%02x:%02x:%02x TID = %d\n",
-                         PRINT_MAC(pEntry->Addr), TID));
+                       ("Can't Accept ADDBA for %pM TID = %d\n",
+                               pEntry->Addr, TID));
        }
        return (Status);
 }
@@ -798,8 +799,8 @@ void BAOriSessionTearDown(struct rt_rtmp_adapter *pAd,
                        /* force send specified TID DelBA */
                        struct rt_mlme_delba_req DelbaReq;
                        struct rt_mlme_queue_elem *Elem =
-                           (struct rt_mlme_queue_elem *)kmalloc(sizeof(struct rt_mlme_queue_elem),
-                                                       MEM_ALLOC_FLAG);
+                               kmalloc(sizeof(struct rt_mlme_queue_elem),
+                                       MEM_ALLOC_FLAG);
                        if (Elem != NULL) {
                                NdisZeroMemory(&DelbaReq, sizeof(DelbaReq));
                                NdisZeroMemory(Elem, sizeof(struct rt_mlme_queue_elem));
@@ -838,8 +839,8 @@ void BAOriSessionTearDown(struct rt_rtmp_adapter *pAd,
            && (pBAEntry->ORI_BA_Status == Originator_Done)) {
                struct rt_mlme_delba_req DelbaReq;
                struct rt_mlme_queue_elem *Elem =
-                   (struct rt_mlme_queue_elem *)kmalloc(sizeof(struct rt_mlme_queue_elem),
-                                               MEM_ALLOC_FLAG);
+                       kmalloc(sizeof(struct rt_mlme_queue_elem),
+                               MEM_ALLOC_FLAG);
                if (Elem != NULL) {
                        NdisZeroMemory(&DelbaReq, sizeof(DelbaReq));
                        NdisZeroMemory(Elem, sizeof(struct rt_mlme_queue_elem));
@@ -907,8 +908,8 @@ void BARecSessionTearDown(struct rt_rtmp_adapter *pAd,
                /* */
                if (bPassive == FALSE) {
                        struct rt_mlme_queue_elem *Elem =
-                           (struct rt_mlme_queue_elem *)kmalloc(sizeof(struct rt_mlme_queue_elem),
-                                                       MEM_ALLOC_FLAG);
+                               kmalloc(sizeof(struct rt_mlme_queue_elem),
+                                       MEM_ALLOC_FLAG);
                        if (Elem != NULL) {
                                NdisZeroMemory(&DelbaReq, sizeof(DelbaReq));
                                NdisZeroMemory(Elem, sizeof(struct rt_mlme_queue_elem));