]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Staging: vt6656: Clean up return from sending power state notifications
authorPhilip Worrall <philip.worrall@googlemail.com>
Wed, 2 Mar 2011 14:34:42 +0000 (14:34 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 2 Mar 2011 20:52:28 +0000 (15:52 -0500)
Clean up power.c so that unnecessary final return statements
are not used when sending power state notifications to
the access point.

Signed-off-by: Philip Worrall <philip.worrall@googlemail.com>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/vt6656/power.c

index 942f371eaf672f01b1c35692a9aed38e682b3b91..2cdfa39ed9f95c2455e96ef744190237fc9627ba 100644 (file)
@@ -130,7 +130,6 @@ void PSvEnablePowerSaving(void *hDeviceContext,
 
        pDevice->bPWBitOn = TRUE;
        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "PS:Power Saving Mode Enable... \n");
-       return;
 }
 
 /*
@@ -163,7 +162,6 @@ void PSvDisablePowerSaving(void *hDeviceContext)
                PSbSendNullPacket(pDevice);
 
        pDevice->bPWBitOn = FALSE;
-       return;
 }
 
 /*
@@ -255,13 +253,10 @@ void PSvSendPSPOLL(void *hDeviceContext)
        pTxPacket->cbMPDULen = WLAN_HDR_ADDR2_LEN;
        pTxPacket->cbPayloadLen = 0;
 
-       /* send the frame */
+       /* log failure if sending failed */
        if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send PS-Poll packet failed..\n");
-       } else {
-               /* DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send PS-Poll packet success..\n"); */
-       };
-       return;
+       }
 }
 
 /*
@@ -316,15 +311,12 @@ BOOL PSbSendNullPacket(void *hDeviceContext)
        memcpy(pTxPacket->p80211Header->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
        pTxPacket->cbMPDULen = WLAN_HDR_ADDR3_LEN;
        pTxPacket->cbPayloadLen = 0;
-       /* send the frame */
+       /* log error if sending failed */
        if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send Null Packet failed !\n");
                return FALSE;
-       } else {
-               /* DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send Null Packet success....\n"); */
        }
-
-       return TRUE ;
+       return TRUE;
 }
 
 /*