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

Staging: bcm: Bcmchar.c: Renamed variable "sWrmBuffer" -> "wrm_buff"

Renamed variable "sWrmBuffer" -> "wrm_buff" in

    bcm_char_ioctl_reg_write_private()
    bcm_char_ioctl_eeprom_reg_read()
Signed-off-by: default avatarMatthias Beyer <mail@beyermatthias.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 343fae74
...@@ -297,7 +297,7 @@ static int bcm_char_ioctl_reg_read_private(void __user *argp, ...@@ -297,7 +297,7 @@ static int bcm_char_ioctl_reg_read_private(void __user *argp,
static int bcm_char_ioctl_reg_write_private(void __user *argp, static int bcm_char_ioctl_reg_write_private(void __user *argp,
struct bcm_mini_adapter *ad) struct bcm_mini_adapter *ad)
{ {
struct bcm_wrm_buffer sWrmBuffer = {0}; struct bcm_wrm_buffer wrm_buff = {0};
struct bcm_ioctl_buffer io_buff; struct bcm_ioctl_buffer io_buff;
UINT uiTempVar = 0; UINT uiTempVar = 0;
INT status; INT status;
...@@ -307,15 +307,15 @@ static int bcm_char_ioctl_reg_write_private(void __user *argp, ...@@ -307,15 +307,15 @@ static int bcm_char_ioctl_reg_write_private(void __user *argp,
if (copy_from_user(&io_buff, argp, sizeof(struct bcm_ioctl_buffer))) if (copy_from_user(&io_buff, argp, sizeof(struct bcm_ioctl_buffer)))
return -EFAULT; return -EFAULT;
if (io_buff.InputLength > sizeof(sWrmBuffer)) if (io_buff.InputLength > sizeof(wrm_buff))
return -EINVAL; return -EINVAL;
/* Get WrmBuffer structure */ /* Get WrmBuffer structure */
if (copy_from_user(&sWrmBuffer, io_buff.InputBuffer, if (copy_from_user(&wrm_buff, io_buff.InputBuffer,
io_buff.InputLength)) io_buff.InputLength))
return -EFAULT; return -EFAULT;
uiTempVar = sWrmBuffer.Register & EEPROM_REJECT_MASK; uiTempVar = wrm_buff.Register & EEPROM_REJECT_MASK;
if (!((ad->pstargetparams->m_u32Customize) & VSG_MODE) && if (!((ad->pstargetparams->m_u32Customize) & VSG_MODE) &&
((uiTempVar == EEPROM_REJECT_REG_1) || ((uiTempVar == EEPROM_REJECT_REG_1) ||
(uiTempVar == EEPROM_REJECT_REG_2) || (uiTempVar == EEPROM_REJECT_REG_2) ||
...@@ -327,8 +327,8 @@ static int bcm_char_ioctl_reg_write_private(void __user *argp, ...@@ -327,8 +327,8 @@ static int bcm_char_ioctl_reg_write_private(void __user *argp,
return -EFAULT; return -EFAULT;
} }
status = wrmalt(ad, (UINT)sWrmBuffer.Register, status = wrmalt(ad, (UINT)wrm_buff.Register,
(PUINT)sWrmBuffer.Data, sizeof(ULONG)); (PUINT)wrm_buff.Data, sizeof(ULONG));
if (status == STATUS_SUCCESS) { if (status == STATUS_SUCCESS) {
BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG,
...@@ -413,7 +413,7 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user *argp, ...@@ -413,7 +413,7 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user *argp,
struct bcm_mini_adapter *ad, struct bcm_mini_adapter *ad,
UINT cmd) UINT cmd)
{ {
struct bcm_wrm_buffer sWrmBuffer = {0}; struct bcm_wrm_buffer wrm_buff = {0};
struct bcm_ioctl_buffer io_buff; struct bcm_ioctl_buffer io_buff;
UINT uiTempVar = 0; UINT uiTempVar = 0;
INT status; INT status;
...@@ -431,24 +431,24 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user *argp, ...@@ -431,24 +431,24 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user *argp,
if (copy_from_user(&io_buff, argp, sizeof(struct bcm_ioctl_buffer))) if (copy_from_user(&io_buff, argp, sizeof(struct bcm_ioctl_buffer)))
return -EFAULT; return -EFAULT;
if (io_buff.InputLength > sizeof(sWrmBuffer)) if (io_buff.InputLength > sizeof(wrm_buff))
return -EINVAL; return -EINVAL;
/* Get WrmBuffer structure */ /* Get WrmBuffer structure */
if (copy_from_user(&sWrmBuffer, io_buff.InputBuffer, if (copy_from_user(&wrm_buff, io_buff.InputBuffer,
io_buff.InputLength)) io_buff.InputLength))
return -EFAULT; return -EFAULT;
if ((((ULONG)sWrmBuffer.Register & 0x0F000000) != 0x0F000000) || if ((((ULONG)wrm_buff.Register & 0x0F000000) != 0x0F000000) ||
((ULONG)sWrmBuffer.Register & 0x3)) { ((ULONG)wrm_buff.Register & 0x3)) {
BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0, BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
"WRM Done On invalid Address : %x Access Denied.\n", "WRM Done On invalid Address : %x Access Denied.\n",
(int)sWrmBuffer.Register); (int)wrm_buff.Register);
return -EINVAL; return -EINVAL;
} }
uiTempVar = sWrmBuffer.Register & EEPROM_REJECT_MASK; uiTempVar = wrm_buff.Register & EEPROM_REJECT_MASK;
if (!((ad->pstargetparams->m_u32Customize) & VSG_MODE) && if (!((ad->pstargetparams->m_u32Customize) & VSG_MODE) &&
((uiTempVar == EEPROM_REJECT_REG_1) || ((uiTempVar == EEPROM_REJECT_REG_1) ||
(uiTempVar == EEPROM_REJECT_REG_2) || (uiTempVar == EEPROM_REJECT_REG_2) ||
...@@ -461,9 +461,9 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user *argp, ...@@ -461,9 +461,9 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user *argp,
return -EFAULT; return -EFAULT;
} }
status = wrmaltWithLock(ad, (UINT)sWrmBuffer.Register, status = wrmaltWithLock(ad, (UINT)wrm_buff.Register,
(PUINT)sWrmBuffer.Data, (PUINT)wrm_buff.Data,
sWrmBuffer.Length); wrm_buff.Length);
if (status == STATUS_SUCCESS) { if (status == STATUS_SUCCESS) {
BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, OSAL_DBG, BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, OSAL_DBG,
......
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