Commit b4a29e10 authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman
Browse files

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



This patch removes typedef for _FLASH2X_READWRITE,
and changes the name of the struct to
bcm_flash2x_readwrite. In addition, any calls to
typedefs FLASH2X_READWRITE, or *PFLASH2X_READWRITE
are changed to call the struct directly.

Signed-off-by: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3712af0c

drivers/staging/bcm/Bcmchar.c

+4 −4
Original line number Diff line number Diff line
@@ -1404,7 +1404,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
	}



	case IOCTL_BCM_FLASH2X_SECTION_READ: {

		FLASH2X_READWRITE sFlash2xRead = {0};

		struct bcm_flash2x_readwrite sFlash2xRead = {0};

		PUCHAR pReadBuff = NULL ;

		UINT NOB = 0;

		UINT BuffSize = 0;
@@ -1422,7 +1422,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
			return -EFAULT;



		/* Reading FLASH 2.x READ structure */

		if (copy_from_user(&sFlash2xRead, IoBuffer.InputBuffer, sizeof(FLASH2X_READWRITE)))

		if (copy_from_user(&sFlash2xRead, IoBuffer.InputBuffer, sizeof(struct bcm_flash2x_readwrite)))

			return -EFAULT;



		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\nsFlash2xRead.Section :%x", sFlash2xRead.Section);
@@ -1495,7 +1495,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
	break;



	case IOCTL_BCM_FLASH2X_SECTION_WRITE: {

		FLASH2X_READWRITE sFlash2xWrite = {0};

		struct bcm_flash2x_readwrite sFlash2xWrite = {0};

		PUCHAR pWriteBuff;

		void __user *InputAddr;

		UINT NOB = 0;
@@ -1517,7 +1517,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
			return -EFAULT;



		/* Reading FLASH 2.x READ structure */

		if (copy_from_user(&sFlash2xWrite, IoBuffer.InputBuffer, sizeof(FLASH2X_READWRITE)))

		if (copy_from_user(&sFlash2xWrite, IoBuffer.InputBuffer, sizeof(struct bcm_flash2x_readwrite)))

			return -EFAULT;



		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\nsFlash2xRead.Section :%x", sFlash2xWrite.Section);

drivers/staging/bcm/Ioctl.h

+2 −2
Original line number Diff line number Diff line
@@ -151,13 +151,13 @@ typedef enum _FLASH2X_SECTION_VAL { 
/*

 * Structure used for READ/WRITE Flash Map2.x

 */

typedef struct _FLASH2X_READWRITE {

struct bcm_flash2x_readwrite {

	FLASH2X_SECTION_VAL Section; /* which section has to be read/written */

	u32 offset;	     /* Offset within Section. */

	u32 numOfBytes;	     /* NOB from the offset */

	u32 bVerify;

	void __user *pDataBuff;	     /* Buffer for reading/writing */

} FLASH2X_READWRITE, *PFLASH2X_READWRITE;

};



/*

 * This structure is used for coping one section to other.

drivers/staging/bcm/Prototypes.h

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ INT BcmDeAllocFlashCSStructure(struct bcm_mini_adapter *psAdapter); 
INT BcmCopyISO(struct bcm_mini_adapter *Adapter, struct bcm_flash2x_copy_section sCopySectStrut);

INT BcmFlash2xCorruptSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal);

INT BcmFlash2xWriteSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlashSectionVal);

INT	validateFlash2xReadWrite(struct bcm_mini_adapter *Adapter, PFLASH2X_READWRITE psFlash2xReadWrite);

INT	validateFlash2xReadWrite(struct bcm_mini_adapter *Adapter, struct bcm_flash2x_readwrite *psFlash2xReadWrite);

INT IsFlash2x(struct bcm_mini_adapter *Adapter);

INT	BcmCopySection(struct bcm_mini_adapter *Adapter,

						FLASH2X_SECTION_VAL SrcSection,

drivers/staging/bcm/nvm.c

+1 −1
Original line number Diff line number Diff line
@@ -3901,7 +3901,7 @@ int BcmFlash2xWriteSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFl 
 * Return values:-Return TRUE is request is valid else FALSE.

 */



int validateFlash2xReadWrite(struct bcm_mini_adapter *Adapter, PFLASH2X_READWRITE psFlash2xReadWrite)

int validateFlash2xReadWrite(struct bcm_mini_adapter *Adapter, struct bcm_flash2x_readwrite *psFlash2xReadWrite)

{

	unsigned int uiNumOfBytes = 0;

	unsigned int uiSectStartOffset = 0;