From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 10 Aug 2014 12:32:07 +0000 (+0200)
Subject: Staging: bcm: Bcmchar.c: Renamed variable "sWrmBuffer" -> "wrm_buff"
X-Git-Tag: firefly_0821_release~176^2~3121^2~1269
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=95123f22a17f57bb5c51d662b1ecc3f6cc21afe6;p=firefly-linux-kernel-4.4.55.git

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: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index f8da3e96ab09..7f12213cf9f4 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -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,
 					    struct bcm_mini_adapter *ad)
 {
-	struct bcm_wrm_buffer sWrmBuffer = {0};
+	struct bcm_wrm_buffer wrm_buff = {0};
 	struct bcm_ioctl_buffer io_buff;
 	UINT uiTempVar = 0;
 	INT status;
@@ -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)))
 		return -EFAULT;
 
-	if (io_buff.InputLength > sizeof(sWrmBuffer))
+	if (io_buff.InputLength > sizeof(wrm_buff))
 		return -EINVAL;
 
 	/* Get WrmBuffer structure */
-	if (copy_from_user(&sWrmBuffer, io_buff.InputBuffer,
+	if (copy_from_user(&wrm_buff, io_buff.InputBuffer,
 		io_buff.InputLength))
 		return -EFAULT;
 
-	uiTempVar = sWrmBuffer.Register & EEPROM_REJECT_MASK;
+	uiTempVar = wrm_buff.Register & EEPROM_REJECT_MASK;
 	if (!((ad->pstargetparams->m_u32Customize) & VSG_MODE) &&
 		((uiTempVar == EEPROM_REJECT_REG_1) ||
 			(uiTempVar == EEPROM_REJECT_REG_2) ||
@@ -327,8 +327,8 @@ static int bcm_char_ioctl_reg_write_private(void __user *argp,
 		return -EFAULT;
 	}
 
-	status = wrmalt(ad, (UINT)sWrmBuffer.Register,
-			(PUINT)sWrmBuffer.Data, sizeof(ULONG));
+	status = wrmalt(ad, (UINT)wrm_buff.Register,
+			(PUINT)wrm_buff.Data, sizeof(ULONG));
 
 	if (status == STATUS_SUCCESS) {
 		BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG,
@@ -413,7 +413,7 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user *argp,
 					   struct bcm_mini_adapter *ad,
 					   UINT cmd)
 {
-	struct bcm_wrm_buffer sWrmBuffer = {0};
+	struct bcm_wrm_buffer wrm_buff = {0};
 	struct bcm_ioctl_buffer io_buff;
 	UINT uiTempVar = 0;
 	INT status;
@@ -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)))
 		return -EFAULT;
 
-	if (io_buff.InputLength > sizeof(sWrmBuffer))
+	if (io_buff.InputLength > sizeof(wrm_buff))
 		return -EINVAL;
 
 	/* Get WrmBuffer structure */
-	if (copy_from_user(&sWrmBuffer, io_buff.InputBuffer,
+	if (copy_from_user(&wrm_buff, io_buff.InputBuffer,
 		io_buff.InputLength))
 		return -EFAULT;
 
-	if ((((ULONG)sWrmBuffer.Register & 0x0F000000) != 0x0F000000) ||
-		((ULONG)sWrmBuffer.Register & 0x3)) {
+	if ((((ULONG)wrm_buff.Register & 0x0F000000) != 0x0F000000) ||
+		((ULONG)wrm_buff.Register & 0x3)) {
 
 		BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
 				"WRM Done On invalid Address : %x Access Denied.\n",
-				(int)sWrmBuffer.Register);
+				(int)wrm_buff.Register);
 		return -EINVAL;
 	}
 
-	uiTempVar = sWrmBuffer.Register & EEPROM_REJECT_MASK;
+	uiTempVar = wrm_buff.Register & EEPROM_REJECT_MASK;
 	if (!((ad->pstargetparams->m_u32Customize) & VSG_MODE) &&
 			((uiTempVar == EEPROM_REJECT_REG_1) ||
 			(uiTempVar == EEPROM_REJECT_REG_2) ||
@@ -461,9 +461,9 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user *argp,
 			return -EFAULT;
 	}
 
-	status = wrmaltWithLock(ad, (UINT)sWrmBuffer.Register,
-				(PUINT)sWrmBuffer.Data,
-				sWrmBuffer.Length);
+	status = wrmaltWithLock(ad, (UINT)wrm_buff.Register,
+				(PUINT)wrm_buff.Data,
+				wrm_buff.Length);
 
 	if (status == STATUS_SUCCESS) {
 		BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, OSAL_DBG,