---

yaml --- r: 338170 b: refs/heads/master c: 98e341d h: refs/heads/master v: v3
git-mirror · Nov 27, 2012 · 2cec47b · 2cec47b
1 parent 106b539
commit 2cec47b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1206c091b2dbe9fb7555eb6bc21694ff11b3579
+refs/heads/master: 98e341d3ddb1eec46f7164a7a895149c671d10f5
diff --git a/trunk/drivers/staging/bcm/Bcmchar.c b/trunk/drivers/staging/bcm/Bcmchar.c
@@ -1118,7 +1118,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 		break;
 
 	case IOCTL_BCM_BULK_WRM: {
-		PBULKWRM_BUFFER pBulkBuffer;
+		struct bcm_bulk_wrm_buffer *pBulkBuffer;
 		UINT uiTempVar = 0;
 		PCHAR pvBuffer = NULL;
 
@@ -1143,7 +1143,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 		if (IS_ERR(pvBuffer))
 			return PTR_ERR(pvBuffer);
 
-		pBulkBuffer = (PBULKWRM_BUFFER)pvBuffer;
+		pBulkBuffer = (struct bcm_bulk_wrm_buffer *)pvBuffer;
 
 		if (((ULONG)pBulkBuffer->Register & 0x0F000000) != 0x0F000000 ||
 			((ULONG)pBulkBuffer->Register & 0x3)) {

diff --git a/trunk/drivers/staging/bcm/Ioctl.h b/trunk/drivers/staging/bcm/Ioctl.h
@@ -123,12 +123,11 @@ typedef  struct _NVM_READWRITE {
 	bool bVerify;
 } NVM_READWRITE, *PNVM_READWRITE;
 
-typedef struct bulkwrmbuffer {
+struct bcm_bulk_wrm_buffer {
 	unsigned long Register;
 	unsigned long SwapEndian;
 	unsigned long Values[1];
-
-} BULKWRM_BUFFER, *PBULKWRM_BUFFER;
+};
 
 typedef enum _FLASH2X_SECTION_VAL {
 	NO_SECTION_VAL = 0, /* no section is chosen when absolute offset is given for RD/WR */