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

Staging: bcm: Bcmchar.c: Renamed variable "sRdmBuffer" -> "rdm_buff"

Renamed variable "sRdmBuffer" -> "rdm_buff" in

    bcm_char_ioctl_reg_read_private()
    bcm_char_ioctl_reg_write_private()
Signed-off-by: default avatarMatthias Beyer <mail@beyermatthias.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent aafec40c
...@@ -246,7 +246,7 @@ static ssize_t bcm_char_read(struct file *filp, ...@@ -246,7 +246,7 @@ static ssize_t bcm_char_read(struct file *filp,
static int bcm_char_ioctl_reg_read_private(void __user *argp, static int bcm_char_ioctl_reg_read_private(void __user *argp,
struct bcm_mini_adapter *ad) struct bcm_mini_adapter *ad)
{ {
struct bcm_rdm_buffer sRdmBuffer = {0}; struct bcm_rdm_buffer rdm_buff = {0};
struct bcm_ioctl_buffer IoBuffer; struct bcm_ioctl_buffer IoBuffer;
PCHAR temp_buff; PCHAR temp_buff;
INT status = STATUS_FAILURE; INT status = STATUS_FAILURE;
...@@ -258,10 +258,10 @@ static int bcm_char_ioctl_reg_read_private(void __user *argp, ...@@ -258,10 +258,10 @@ static int bcm_char_ioctl_reg_read_private(void __user *argp,
if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer))) if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
return -EFAULT; return -EFAULT;
if (IoBuffer.InputLength > sizeof(sRdmBuffer)) if (IoBuffer.InputLength > sizeof(rdm_buff))
return -EINVAL; return -EINVAL;
if (copy_from_user(&sRdmBuffer, IoBuffer.InputBuffer, if (copy_from_user(&rdm_buff, IoBuffer.InputBuffer,
IoBuffer.InputLength)) IoBuffer.InputLength))
return -EFAULT; return -EFAULT;
...@@ -278,7 +278,7 @@ static int bcm_char_ioctl_reg_read_private(void __user *argp, ...@@ -278,7 +278,7 @@ static int bcm_char_ioctl_reg_read_private(void __user *argp,
if (!temp_buff) if (!temp_buff)
return -ENOMEM; return -ENOMEM;
bytes = rdmalt(ad, (UINT)sRdmBuffer.Register, bytes = rdmalt(ad, (UINT)rdm_buff.Register,
(PUINT)temp_buff, Bufflen); (PUINT)temp_buff, Bufflen);
if (bytes > 0) { if (bytes > 0) {
status = STATUS_SUCCESS; status = STATUS_SUCCESS;
...@@ -344,7 +344,7 @@ static int bcm_char_ioctl_reg_write_private(void __user *argp, ...@@ -344,7 +344,7 @@ static int bcm_char_ioctl_reg_write_private(void __user *argp,
static int bcm_char_ioctl_eeprom_reg_read(void __user *argp, static int bcm_char_ioctl_eeprom_reg_read(void __user *argp,
struct bcm_mini_adapter *ad) struct bcm_mini_adapter *ad)
{ {
struct bcm_rdm_buffer sRdmBuffer = {0}; struct bcm_rdm_buffer rdm_buff = {0};
struct bcm_ioctl_buffer IoBuffer; struct bcm_ioctl_buffer IoBuffer;
PCHAR temp_buff = NULL; PCHAR temp_buff = NULL;
UINT uiTempVar = 0; UINT uiTempVar = 0;
...@@ -364,10 +364,10 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user *argp, ...@@ -364,10 +364,10 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user *argp,
if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer))) if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
return -EFAULT; return -EFAULT;
if (IoBuffer.InputLength > sizeof(sRdmBuffer)) if (IoBuffer.InputLength > sizeof(rdm_buff))
return -EINVAL; return -EINVAL;
if (copy_from_user(&sRdmBuffer, IoBuffer.InputBuffer, if (copy_from_user(&rdm_buff, IoBuffer.InputBuffer,
IoBuffer.InputLength)) IoBuffer.InputLength))
return -EFAULT; return -EFAULT;
...@@ -380,19 +380,19 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user *argp, ...@@ -380,19 +380,19 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user *argp,
if (!temp_buff) if (!temp_buff)
return STATUS_FAILURE; return STATUS_FAILURE;
if ((((ULONG)sRdmBuffer.Register & 0x0F000000) != 0x0F000000) || if ((((ULONG)rdm_buff.Register & 0x0F000000) != 0x0F000000) ||
((ULONG)sRdmBuffer.Register & 0x3)) { ((ULONG)rdm_buff.Register & 0x3)) {
BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0, BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
"RDM Done On invalid Address : %x Access Denied.\n", "RDM Done On invalid Address : %x Access Denied.\n",
(int)sRdmBuffer.Register); (int)rdm_buff.Register);
kfree(temp_buff); kfree(temp_buff);
return -EINVAL; return -EINVAL;
} }
uiTempVar = sRdmBuffer.Register & EEPROM_REJECT_MASK; uiTempVar = rdm_buff.Register & EEPROM_REJECT_MASK;
bytes = rdmaltWithLock(ad, (UINT)sRdmBuffer.Register, bytes = rdmaltWithLock(ad, (UINT)rdm_buff.Register,
(PUINT)temp_buff, IoBuffer.OutputLength); (PUINT)temp_buff, IoBuffer.OutputLength);
if (bytes > 0) { if (bytes > 0) {
......
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