From e25b75ec83ec1d76690a9f26d457d2af945119d2 Mon Sep 17 00:00:00 2001 From: Philip Worrall Date: Wed, 2 Mar 2011 14:34:42 +0000 Subject: [PATCH] Staging: vt6656: Clean up return from sending power state notifications 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 Reviewed-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/power.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/staging/vt6656/power.c b/drivers/staging/vt6656/power.c index 942f371eaf67..2cdfa39ed9f9 100644 --- a/drivers/staging/vt6656/power.c +++ b/drivers/staging/vt6656/power.c @@ -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; } /* -- 2.20.1