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

Hi,

The [vk][cmz]alloc(_node) family of functions return void pointers which
it's completely unnecessary/pointless to cast to other pointer types since
that happens implicitly.

This patch removes such casts from drivers/staging/rt2860/

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rt2860/common/ba_action.c b/drivers/staging/rt2860/common/ba_action.c
index 8eef82d92621f9a37d8c6d9a747c0fdd8328946b..ed8854b902d18517069b404d8144d92867f6c6bc 100644 (file)
--- a/drivers/staging/rt2860/common/ba_action.c
+++ b/drivers/staging/rt2860/common/ba_action.c
@@ -799,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));
@@ -839,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));
@@ -908,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));

diff --git a/drivers/staging/rt2860/rt_main_dev.c b/drivers/staging/rt2860/rt_main_dev.c
index 19e9bc6569f88d18e1895666a3685c15c1ce5f9f..e8648219e0b5cc67a1746ed07efbccae2b7f2ac6 100644 (file)
--- a/drivers/staging/rt2860/rt_main_dev.c
+++ b/drivers/staging/rt2860/rt_main_dev.c
@@ -102,8 +102,8 @@ int MainVirtualIF_close(IN struct net_device *net_dev)
                    (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NIC_NOT_EXIST))) {
                        struct rt_mlme_disassoc_req DisReq;
                        struct rt_mlme_queue_elem *MsgElem =
-                           (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 (MsgElem) {
                                COPY_MAC_ADDR(DisReq.Addr,
@@ -725,7 +725,8 @@ Note:
 int AdapterBlockAllocateMemory(void *handle, void ** ppAd)
 {
 
-       *ppAd = (void *)vmalloc(sizeof(struct rt_rtmp_adapter));        /*pci_alloc_consistent(pci_dev, sizeof(struct rt_rtmp_adapter), phy_addr); */
+       *ppAd = vmalloc(sizeof(struct rt_rtmp_adapter));
+       /* pci_alloc_consistent(pci_dev, sizeof(struct rt_rtmp_adapter), phy_addr); */
 
        if (*ppAd) {
                NdisZeroMemory(*ppAd, sizeof(struct rt_rtmp_adapter));