From: Philip Worrall <philip.worrall@xxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxx>
Reviewed-by: Dan Carpenter <error27@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
---
drivers/staging/vt6656/power.c | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/vt6656/power.c b/drivers/staging/vt6656/power.c
index 942f371..2cdfa39 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;
}
/*
--
1.7.4.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
