From e17219af18faf7e093390d6273f709df7e20ff60 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 10 Aug 2014 14:31:57 +0200 Subject: [PATCH] Staging: bcm: Bcmchar.c: Renamed variable "pReadData" -> "read_data" Renamed variable "pReadData" -> "read_data" in bcm_handle_nvm_read_cmd() handle_flash2x_adapter() Signed-off-by: Matthias Beyer Signed-off-by: Greg Kroah-Hartman --- drivers/staging/bcm/Bcmchar.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c index c65fc396502e..5b8e8be3efdf 100644 --- a/drivers/staging/bcm/Bcmchar.c +++ b/drivers/staging/bcm/Bcmchar.c @@ -3,7 +3,7 @@ #include "headers.h" static int bcm_handle_nvm_read_cmd(struct bcm_mini_adapter *ad, - PUCHAR pReadData, + PUCHAR read_data, struct bcm_nvm_readwrite *stNVMReadWrite) { INT Status = STATUS_FAILURE; @@ -17,23 +17,23 @@ static int bcm_handle_nvm_read_cmd(struct bcm_mini_adapter *ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device is in Idle/Shutdown Mode\n"); up(&ad->NVMRdmWrmLock); - kfree(pReadData); + kfree(read_data); return -EACCES; } - Status = BeceemNVMRead(ad, (PUINT)pReadData, + Status = BeceemNVMRead(ad, (PUINT)read_data, stNVMReadWrite->uiOffset, stNVMReadWrite->uiNumBytes); up(&ad->NVMRdmWrmLock); if (Status != STATUS_SUCCESS) { - kfree(pReadData); + kfree(read_data); return Status; } - if (copy_to_user(stNVMReadWrite->pBuffer, pReadData, + if (copy_to_user(stNVMReadWrite->pBuffer, read_data, stNVMReadWrite->uiNumBytes)) { - kfree(pReadData); + kfree(read_data); return -EFAULT; } @@ -41,7 +41,7 @@ static int bcm_handle_nvm_read_cmd(struct bcm_mini_adapter *ad, } static int handle_flash2x_adapter(struct bcm_mini_adapter *ad, - PUCHAR pReadData, + PUCHAR read_data, struct bcm_nvm_readwrite *stNVMReadWrite) { /* @@ -73,18 +73,18 @@ static int handle_flash2x_adapter(struct bcm_mini_adapter *ad, BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "DSD Sig is present neither in Flash nor User provided Input.."); up(&ad->NVMRdmWrmLock); - kfree(pReadData); + kfree(read_data); return Status; } ulDSDMagicNumInUsrBuff = - ntohl(*(PUINT)(pReadData + stNVMReadWrite->uiNumBytes - + ntohl(*(PUINT)(read_data + stNVMReadWrite->uiNumBytes - SIGNATURE_SIZE)); if (ulDSDMagicNumInUsrBuff != DSD_IMAGE_MAGIC_NUMBER) { BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "DSD Sig is present neither in Flash nor User provided Input.."); up(&ad->NVMRdmWrmLock); - kfree(pReadData); + kfree(read_data); return Status; } -- 2.34.1