Commit ddf559a9 authored by Matthias Beyer's avatar Matthias Beyer Committed by Greg Kroah-Hartman

Staging: bcm: Bcmchar.c: Renamed variable: "sFlash2xRead" -> "flash_2x_read"

Signed-off-by: default avatarMatthias Beyer <mail@beyermatthias.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f4570048
...@@ -1599,7 +1599,7 @@ static int bcm_char_ioctl_nvm_rw(void __user *argp, ...@@ -1599,7 +1599,7 @@ static int bcm_char_ioctl_nvm_rw(void __user *argp,
static int bcm_char_ioctl_flash2x_section_read(void __user *argp, static int bcm_char_ioctl_flash2x_section_read(void __user *argp,
struct bcm_mini_adapter *ad) struct bcm_mini_adapter *ad)
{ {
struct bcm_flash2x_readwrite sFlash2xRead = {0}; struct bcm_flash2x_readwrite flash_2x_read = {0};
struct bcm_ioctl_buffer io_buff; struct bcm_ioctl_buffer io_buff;
PUCHAR pReadBuff = NULL; PUCHAR pReadBuff = NULL;
UINT NOB = 0; UINT NOB = 0;
...@@ -1621,36 +1621,36 @@ static int bcm_char_ioctl_flash2x_section_read(void __user *argp, ...@@ -1621,36 +1621,36 @@ static int bcm_char_ioctl_flash2x_section_read(void __user *argp,
return -EFAULT; return -EFAULT;
/* Reading FLASH 2.x READ structure */ /* Reading FLASH 2.x READ structure */
if (copy_from_user(&sFlash2xRead, io_buff.InputBuffer, if (copy_from_user(&flash_2x_read, io_buff.InputBuffer,
sizeof(struct bcm_flash2x_readwrite))) sizeof(struct bcm_flash2x_readwrite)))
return -EFAULT; return -EFAULT;
BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
"\nsFlash2xRead.Section :%x", "\nflash_2x_read.Section :%x",
sFlash2xRead.Section); flash_2x_read.Section);
BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
"\nsFlash2xRead.offset :%x", "\nflash_2x_read.offset :%x",
sFlash2xRead.offset); flash_2x_read.offset);
BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
"\nsFlash2xRead.numOfBytes :%x", "\nflash_2x_read.numOfBytes :%x",
sFlash2xRead.numOfBytes); flash_2x_read.numOfBytes);
BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
"\nsFlash2xRead.bVerify :%x\n", "\nflash_2x_read.bVerify :%x\n",
sFlash2xRead.bVerify); flash_2x_read.bVerify);
/* This was internal to driver for raw read. /* This was internal to driver for raw read.
* now it has ben exposed to user space app. * now it has ben exposed to user space app.
*/ */
if (validateFlash2xReadWrite(ad, &sFlash2xRead) == false) if (validateFlash2xReadWrite(ad, &flash_2x_read) == false)
return STATUS_FAILURE; return STATUS_FAILURE;
NOB = sFlash2xRead.numOfBytes; NOB = flash_2x_read.numOfBytes;
if (NOB > ad->uiSectorSize) if (NOB > ad->uiSectorSize)
BuffSize = ad->uiSectorSize; BuffSize = ad->uiSectorSize;
else else
BuffSize = NOB; BuffSize = NOB;
ReadOffset = sFlash2xRead.offset; ReadOffset = flash_2x_read.offset;
OutPutBuff = io_buff.OutputBuffer; OutPutBuff = io_buff.OutputBuffer;
pReadBuff = kzalloc(BuffSize , GFP_KERNEL); pReadBuff = kzalloc(BuffSize , GFP_KERNEL);
...@@ -1681,7 +1681,7 @@ static int bcm_char_ioctl_flash2x_section_read(void __user *argp, ...@@ -1681,7 +1681,7 @@ static int bcm_char_ioctl_flash2x_section_read(void __user *argp,
/* Reading the data from Flash 2.x */ /* Reading the data from Flash 2.x */
status = BcmFlash2xBulkRead(ad, (PUINT)pReadBuff, status = BcmFlash2xBulkRead(ad, (PUINT)pReadBuff,
sFlash2xRead.Section, ReadOffset, ReadBytes); flash_2x_read.Section, ReadOffset, ReadBytes);
if (status) { if (status) {
BCM_DEBUG_PRINT(ad, BCM_DEBUG_PRINT(ad,
DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment