Commit 98e341d3 authored Nov 22, 2012 by Kevin McKinney Committed by Greg Kroah-Hartman Nov 26, 2012

Staging: bcm: Remove typedef for bulkwrmbuffer and call directly.



This patch removes typedef for bulkwrmbuffer,
and changes the name of the struct to
bcm_bulk_wrm_buffer. In addition, any calls to
typedefs BULKWRM_BUFFER, or *PBULKWRM_BUFFER
are changed to call the struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent b1206c09

drivers/staging/bcm/Bcmchar.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)) {

drivers/staging/bcm/Ioctl.h

+2 −3

Original line number	Diff line number	Diff line
		@@ -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 */