staging, rt2860: Remove unnecessary casts of void ptr returning alloc function return values
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>
This commit is contained in:
parent
60a1d01bcd
commit
131a14b3f0
|
@ -799,8 +799,8 @@ void BAOriSessionTearDown(struct rt_rtmp_adapter *pAd,
|
||||||
/* force send specified TID DelBA */
|
/* force send specified TID DelBA */
|
||||||
struct rt_mlme_delba_req DelbaReq;
|
struct rt_mlme_delba_req DelbaReq;
|
||||||
struct rt_mlme_queue_elem *Elem =
|
struct rt_mlme_queue_elem *Elem =
|
||||||
(struct rt_mlme_queue_elem *)kmalloc(sizeof(struct rt_mlme_queue_elem),
|
kmalloc(sizeof(struct rt_mlme_queue_elem),
|
||||||
MEM_ALLOC_FLAG);
|
MEM_ALLOC_FLAG);
|
||||||
if (Elem != NULL) {
|
if (Elem != NULL) {
|
||||||
NdisZeroMemory(&DelbaReq, sizeof(DelbaReq));
|
NdisZeroMemory(&DelbaReq, sizeof(DelbaReq));
|
||||||
NdisZeroMemory(Elem, sizeof(struct rt_mlme_queue_elem));
|
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)) {
|
&& (pBAEntry->ORI_BA_Status == Originator_Done)) {
|
||||||
struct rt_mlme_delba_req DelbaReq;
|
struct rt_mlme_delba_req DelbaReq;
|
||||||
struct rt_mlme_queue_elem *Elem =
|
struct rt_mlme_queue_elem *Elem =
|
||||||
(struct rt_mlme_queue_elem *)kmalloc(sizeof(struct rt_mlme_queue_elem),
|
kmalloc(sizeof(struct rt_mlme_queue_elem),
|
||||||
MEM_ALLOC_FLAG);
|
MEM_ALLOC_FLAG);
|
||||||
if (Elem != NULL) {
|
if (Elem != NULL) {
|
||||||
NdisZeroMemory(&DelbaReq, sizeof(DelbaReq));
|
NdisZeroMemory(&DelbaReq, sizeof(DelbaReq));
|
||||||
NdisZeroMemory(Elem, sizeof(struct rt_mlme_queue_elem));
|
NdisZeroMemory(Elem, sizeof(struct rt_mlme_queue_elem));
|
||||||
|
@ -908,8 +908,8 @@ void BARecSessionTearDown(struct rt_rtmp_adapter *pAd,
|
||||||
/* */
|
/* */
|
||||||
if (bPassive == FALSE) {
|
if (bPassive == FALSE) {
|
||||||
struct rt_mlme_queue_elem *Elem =
|
struct rt_mlme_queue_elem *Elem =
|
||||||
(struct rt_mlme_queue_elem *)kmalloc(sizeof(struct rt_mlme_queue_elem),
|
kmalloc(sizeof(struct rt_mlme_queue_elem),
|
||||||
MEM_ALLOC_FLAG);
|
MEM_ALLOC_FLAG);
|
||||||
if (Elem != NULL) {
|
if (Elem != NULL) {
|
||||||
NdisZeroMemory(&DelbaReq, sizeof(DelbaReq));
|
NdisZeroMemory(&DelbaReq, sizeof(DelbaReq));
|
||||||
NdisZeroMemory(Elem, sizeof(struct rt_mlme_queue_elem));
|
NdisZeroMemory(Elem, sizeof(struct rt_mlme_queue_elem));
|
||||||
|
|
|
@ -102,8 +102,8 @@ int MainVirtualIF_close(IN struct net_device *net_dev)
|
||||||
(!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NIC_NOT_EXIST))) {
|
(!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NIC_NOT_EXIST))) {
|
||||||
struct rt_mlme_disassoc_req DisReq;
|
struct rt_mlme_disassoc_req DisReq;
|
||||||
struct rt_mlme_queue_elem *MsgElem =
|
struct rt_mlme_queue_elem *MsgElem =
|
||||||
(struct rt_mlme_queue_elem *)kmalloc(sizeof(struct rt_mlme_queue_elem),
|
kmalloc(sizeof(struct rt_mlme_queue_elem),
|
||||||
MEM_ALLOC_FLAG);
|
MEM_ALLOC_FLAG);
|
||||||
|
|
||||||
if (MsgElem) {
|
if (MsgElem) {
|
||||||
COPY_MAC_ADDR(DisReq.Addr,
|
COPY_MAC_ADDR(DisReq.Addr,
|
||||||
|
@ -725,7 +725,8 @@ Note:
|
||||||
int AdapterBlockAllocateMemory(void *handle, void ** ppAd)
|
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) {
|
if (*ppAd) {
|
||||||
NdisZeroMemory(*ppAd, sizeof(struct rt_rtmp_adapter));
|
NdisZeroMemory(*ppAd, sizeof(struct rt_rtmp_adapter));
|
||||||
|
|
Loading…
Reference in New Issue