[PATCH 35/44] Staging: bcm: Bcmchar.c: Renamed variable "sWrmBuffer" -> "wrm_buff"

[Matthias Beyer <mail@xxxxxxxxxxxxxxxx>]

Renamed variable "sWrmBuffer" -> "wrm_buff" in
bcm_char_ioctl_eeprom_reg_read().

Signed-off-by: Matthias Beyer <mail@xxxxxxxxxxxxxxxx>
---
 drivers/staging/bcm/Bcmchar.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index f6af424..071b5e2 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -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 IoBuffer;
 	UINT uiTempVar = 0;
 	INT Status;
@@ -431,24 +431,24 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user *argp,
 	if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
 		return -EFAULT;
 
-	if (IoBuffer.InputLength > sizeof(sWrmBuffer))
+	if (IoBuffer.InputLength > sizeof(wrm_buff))
 		return -EINVAL;
 
 	/* Get WrmBuffer structure */
-	if (copy_from_user(&sWrmBuffer, IoBuffer.InputBuffer,
+	if (copy_from_user(&wrm_buff, IoBuffer.InputBuffer,
 		IoBuffer.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,
-- 
2.0.3

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel