From: Matthias Beyer Date: Sun, 10 Aug 2014 12:32:00 +0000 (+0200) Subject: Staging: bcm: Bcmchar.c: Renamed variable "ulDSDMagicNumInUsrBuff" -> "dsd_magic_num_... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=900025a3bd73e38ed6df25e3751c480babbcaf4c;p=linux-beck.git Staging: bcm: Bcmchar.c: Renamed variable "ulDSDMagicNumInUsrBuff" -> "dsd_magic_num_in_usr_buff" Renamed variable "ulDSDMagicNumInUsrBuff" -> "dsd_magic_num_in_usr_buff" in handle_flash2x_adapter(). Signed-off-by: Matthias Beyer Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c index 74e91bea3e45..c4e126f769df 100644 --- a/drivers/staging/bcm/Bcmchar.c +++ b/drivers/staging/bcm/Bcmchar.c @@ -59,7 +59,7 @@ static int handle_flash2x_adapter(struct bcm_mini_adapter *ad, * considered valid. */ INT status; - ULONG ulDSDMagicNumInUsrBuff = 0; + ULONG dsd_magic_num_in_usr_buff = 0; status = BcmFlash2xCorruptSig(ad, ad->eActiveDSD); if (status == STATUS_SUCCESS) @@ -76,10 +76,10 @@ static int handle_flash2x_adapter(struct bcm_mini_adapter *ad, return status; } - ulDSDMagicNumInUsrBuff = + dsd_magic_num_in_usr_buff = ntohl(*(PUINT)(read_data + nvm_rw->uiNumBytes - SIGNATURE_SIZE)); - if (ulDSDMagicNumInUsrBuff != DSD_IMAGE_MAGIC_NUMBER) { + if (dsd_magic_num_in_usr_buff != 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);