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

Staging: bcm: Bcmchar.c: Renamed variable "uiTempVar" -> "tmp"

Renamed variable "uiTempVar" -> "tmp" 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 7f12213cf9f4..0622bfc835de 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -299,7 +299,7 @@ static int bcm_char_ioctl_reg_write_private(void __user *argp,
 {
 	struct bcm_wrm_buffer wrm_buff = {0};
 	struct bcm_ioctl_buffer io_buff;
-	UINT uiTempVar = 0;
+	UINT tmp = 0;
 	INT status;
 
 	/* Copy Ioctl Buffer structure */
@@ -315,12 +315,12 @@ static int bcm_char_ioctl_reg_write_private(void __user *argp,
 		io_buff.InputLength))
 		return -EFAULT;
 
-	uiTempVar = wrm_buff.Register & EEPROM_REJECT_MASK;
+	tmp = wrm_buff.Register & EEPROM_REJECT_MASK;
 	if (!((ad->pstargetparams->m_u32Customize) & VSG_MODE) &&
-		((uiTempVar == EEPROM_REJECT_REG_1) ||
-			(uiTempVar == EEPROM_REJECT_REG_2) ||
-			(uiTempVar == EEPROM_REJECT_REG_3) ||
-			(uiTempVar == EEPROM_REJECT_REG_4))) {
+		((tmp == EEPROM_REJECT_REG_1) ||
+			(tmp == EEPROM_REJECT_REG_2) ||
+			(tmp == EEPROM_REJECT_REG_3) ||
+			(tmp == EEPROM_REJECT_REG_4))) {
 
 		BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
 				"EEPROM Access Denied, not in VSG Mode\n");
@@ -347,7 +347,7 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user *argp,
 	struct bcm_rdm_buffer rdm_buff = {0};
 	struct bcm_ioctl_buffer io_buff;
 	PCHAR temp_buff = NULL;
-	UINT uiTempVar = 0;
+	UINT tmp = 0;
 	INT status;
 	int bytes;
 
@@ -391,7 +391,7 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user *argp,
 		return -EINVAL;
 	}
 
-	uiTempVar = rdm_buff.Register & EEPROM_REJECT_MASK;
+	tmp = rdm_buff.Register & EEPROM_REJECT_MASK;
 	bytes = rdmaltWithLock(ad, (UINT)rdm_buff.Register,
 			       (PUINT)temp_buff, io_buff.OutputLength);
 
@@ -415,7 +415,7 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user *argp,
 {
 	struct bcm_wrm_buffer wrm_buff = {0};
 	struct bcm_ioctl_buffer io_buff;
-	UINT uiTempVar = 0;
+	UINT tmp = 0;
 	INT status;
 
 	if ((ad->IdleMode == TRUE) ||
@@ -448,12 +448,12 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user *argp,
 		return -EINVAL;
 	}
 
-	uiTempVar = wrm_buff.Register & EEPROM_REJECT_MASK;
+	tmp = wrm_buff.Register & EEPROM_REJECT_MASK;
 	if (!((ad->pstargetparams->m_u32Customize) & VSG_MODE) &&
-			((uiTempVar == EEPROM_REJECT_REG_1) ||
-			(uiTempVar == EEPROM_REJECT_REG_2) ||
-			(uiTempVar == EEPROM_REJECT_REG_3) ||
-			(uiTempVar == EEPROM_REJECT_REG_4)) &&
+			((tmp == EEPROM_REJECT_REG_1) ||
+			(tmp == EEPROM_REJECT_REG_2) ||
+			(tmp == EEPROM_REJECT_REG_3) ||
+			(tmp == EEPROM_REJECT_REG_4)) &&
 			(cmd == IOCTL_BCM_REGISTER_WRITE)) {
 
 			BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,