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

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



This patch removes typedef for _FLASH2X_VENDORSPECIFIC_INFO,
and changes the name of the struct to bcm_flash2x_vendor_info.
In addition, any calls to typedefs FLASH2X_VENDORSPECIFIC_INFO,
or *PFLASH2X_VENDORSPECIFIC_INFO 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 77b54101

drivers/staging/bcm/Adapter.h

+1 −1
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ struct bcm_mini_adapter { 
	/*	BOOLEAN				InterfaceUpStatus; */

	PFLASH2X_CS_INFO	psFlash2xCSInfo;

	PFLASH_CS_INFO		psFlashCSInfo;

	PFLASH2X_VENDORSPECIFIC_INFO psFlash2xVendorInfo;

	struct bcm_flash2x_vendor_info *psFlash2xVendorInfo;

	UINT			uiFlashBaseAdd; /* Flash start address */

	UINT			uiActiveISOOffset; /* Active ISO offset chosen before f/w download */

	enum bcm_flash2x_section_val eActiveISO; /* Active ISO section val */

drivers/staging/bcm/nvm.c

+1 −1
Original line number Diff line number Diff line
@@ -2241,7 +2241,7 @@ int BcmAllocFlashCSStructure(struct bcm_mini_adapter *psAdapter) 
		return -ENOMEM;

	}



	psAdapter->psFlash2xVendorInfo = (PFLASH2X_VENDORSPECIFIC_INFO)kzalloc(sizeof(FLASH2X_VENDORSPECIFIC_INFO), GFP_KERNEL);

	psAdapter->psFlash2xVendorInfo = (struct bcm_flash2x_vendor_info *)kzalloc(sizeof(struct bcm_flash2x_vendor_info), GFP_KERNEL);

	if (!psAdapter->psFlash2xVendorInfo) {

		BCM_DEBUG_PRINT(psAdapter, DBG_TYPE_PRINTK, 0, 0, "Can't Allocate Vendor Info Memory for Flash 2.x");

		kfree(psAdapter->psFlashCSInfo);

drivers/staging/bcm/nvm.h

+2 −2
Original line number Diff line number Diff line
@@ -127,10 +127,10 @@ typedef struct _VENDOR_SECTION_INFO { 
	u32 Reserved[16];

} VENDOR_SECTION_INFO, *PVENDOR_SECTION_INFO;



typedef struct _FLASH2X_VENDORSPECIFIC_INFO {

struct bcm_flash2x_vendor_info {

	VENDOR_SECTION_INFO VendorSection[TOTAL_SECTIONS];

	u32 Reserved[16];

} FLASH2X_VENDORSPECIFIC_INFO, *PFLASH2X_VENDORSPECIFIC_INFO;

};



struct bcm_dsd_header {

	u32 DSDImageSize;

drivers/staging/bcm/vendorspecificextn.c

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
//		STATUS_SUCCESS/STATUS_FAILURE

//

//-----------------------------------------------------------------------------

INT vendorextnGetSectionInfo(PVOID  pContext,PFLASH2X_VENDORSPECIFIC_INFO pVendorInfo)

INT vendorextnGetSectionInfo(PVOID  pContext, struct bcm_flash2x_vendor_info *pVendorInfo)

{

	return STATUS_FAILURE;

}

drivers/staging/bcm/vendorspecificextn.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


#define CONTINUE_COMMON_PATH 0xFFFF



INT vendorextnGetSectionInfo(PVOID  pContext,PFLASH2X_VENDORSPECIFIC_INFO pVendorInfo);

INT vendorextnGetSectionInfo(PVOID  pContext, struct bcm_flash2x_vendor_info *pVendorInfo);

INT vendorextnExit(struct bcm_mini_adapter *Adapter);

INT vendorextnInit(struct bcm_mini_adapter *Adapter);

INT vendorextnIoctl(struct bcm_mini_adapter *Adapter, UINT cmd, ULONG arg);