[PATCH 05/44] Staging: bcm: Bcmchar.c: Renamed variable "Adapter" -> "ad"

Matthias Beyer mail at beyermatthias.de
Sun Aug 3 15:37:05 UTC 2014


Renamed variable "Adapter" -> "ad" in handle_flash2x_adapter().

Signed-off-by: Matthias Beyer <mail at beyermatthias.de>
---
 drivers/staging/bcm/Bcmchar.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 52f810d..774ec12 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -39,7 +39,7 @@ static int bcm_handle_nvm_read_cmd(struct bcm_mini_adapter *ad,
 	return STATUS_SUCCESS;
 }
 
-static int handle_flash2x_adapter(struct bcm_mini_adapter *Adapter,
+static int handle_flash2x_adapter(struct bcm_mini_adapter *ad,
 				  PUCHAR pReadData,
 				  struct bcm_nvm_readwrite *stNVMReadWrite)
 {
@@ -61,17 +61,17 @@ static int handle_flash2x_adapter(struct bcm_mini_adapter *Adapter,
 	INT Status;
 	ULONG ulDSDMagicNumInUsrBuff = 0;
 
-	Status = BcmFlash2xCorruptSig(Adapter, Adapter->eActiveDSD);
+	Status = BcmFlash2xCorruptSig(ad, ad->eActiveDSD);
 	if (Status == STATUS_SUCCESS)
 		return STATUS_SUCCESS;
 
 	if (((stNVMReadWrite->uiOffset + stNVMReadWrite->uiNumBytes) !=
-			Adapter->uiNVMDSDSize) ||
+			ad->uiNVMDSDSize) ||
 			(stNVMReadWrite->uiNumBytes < SIGNATURE_SIZE)) {
 
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
+		BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
 				"DSD Sig is present neither in Flash nor User provided Input..");
-		up(&Adapter->NVMRdmWrmLock);
+		up(&ad->NVMRdmWrmLock);
 		kfree(pReadData);
 		return Status;
 	}
@@ -80,9 +80,9 @@ static int handle_flash2x_adapter(struct bcm_mini_adapter *Adapter,
 		ntohl(*(PUINT)(pReadData + stNVMReadWrite->uiNumBytes -
 		      SIGNATURE_SIZE));
 	if (ulDSDMagicNumInUsrBuff != DSD_IMAGE_MAGIC_NUMBER) {
-		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
+		BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
 				"DSD Sig is present neither in Flash nor User provided Input..");
-		up(&Adapter->NVMRdmWrmLock);
+		up(&ad->NVMRdmWrmLock);
 		kfree(pReadData);
 		return Status;
 	}
-- 
2.0.3



More information about the devel mailing list