Staging: bcm: Remove typedef for _FLASH2X_COPY_SECTION and call directly.
This patch removes typedef for _FLASH2X_COPY_SECTION, and changes the name of the struct to bcm_flash2x_copy_section. In addition, any calls to typedefs FLASH2X_COPY_SECTION, or *PFLASH2X_COPY_SECTION are changed to call the struct directly. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
3b99b9d553
commit
b1206c091b
|
@ -1692,7 +1692,7 @@ cntrlEnd:
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case IOCTL_BCM_COPY_SECTION: {
|
case IOCTL_BCM_COPY_SECTION: {
|
||||||
FLASH2X_COPY_SECTION sCopySectStrut = {0};
|
struct bcm_flash2x_copy_section sCopySectStrut = {0};
|
||||||
Status = STATUS_SUCCESS;
|
Status = STATUS_SUCCESS;
|
||||||
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_COPY_SECTION Called");
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_COPY_SECTION Called");
|
||||||
|
|
||||||
|
@ -1708,7 +1708,7 @@ cntrlEnd:
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
}
|
}
|
||||||
|
|
||||||
Status = copy_from_user(&sCopySectStrut, IoBuffer.InputBuffer, sizeof(FLASH2X_COPY_SECTION));
|
Status = copy_from_user(&sCopySectStrut, IoBuffer.InputBuffer, sizeof(struct bcm_flash2x_copy_section));
|
||||||
if (Status) {
|
if (Status) {
|
||||||
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of Copy_Section_Struct failed with Status :%d", Status);
|
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of Copy_Section_Struct failed with Status :%d", Status);
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
|
|
|
@ -167,12 +167,12 @@ typedef struct _FLASH2X_READWRITE {
|
||||||
* if NOB !=0, only NOB will be copied from the given offset.
|
* if NOB !=0, only NOB will be copied from the given offset.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
typedef struct _FLASH2X_COPY_SECTION {
|
struct bcm_flash2x_copy_section {
|
||||||
FLASH2X_SECTION_VAL SrcSection;
|
FLASH2X_SECTION_VAL SrcSection;
|
||||||
FLASH2X_SECTION_VAL DstSection;
|
FLASH2X_SECTION_VAL DstSection;
|
||||||
u32 offset;
|
u32 offset;
|
||||||
u32 numOfBytes;
|
u32 numOfBytes;
|
||||||
} FLASH2X_COPY_SECTION, *PFLASH2X_COPY_SECTION;
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This section provide the complete bitmap of the Flash.
|
* This section provide the complete bitmap of the Flash.
|
||||||
|
|
|
@ -186,7 +186,7 @@ INT BcmSetActiveSection(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eF
|
||||||
INT BcmAllocFlashCSStructure(struct bcm_mini_adapter *psAdapter);
|
INT BcmAllocFlashCSStructure(struct bcm_mini_adapter *psAdapter);
|
||||||
INT BcmDeAllocFlashCSStructure(struct bcm_mini_adapter *psAdapter);
|
INT BcmDeAllocFlashCSStructure(struct bcm_mini_adapter *psAdapter);
|
||||||
|
|
||||||
INT BcmCopyISO(struct bcm_mini_adapter *Adapter, FLASH2X_COPY_SECTION sCopySectStrut);
|
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 BcmFlash2xCorruptSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlash2xSectionVal);
|
||||||
INT BcmFlash2xWriteSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlashSectionVal);
|
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, PFLASH2X_READWRITE psFlash2xReadWrite);
|
||||||
|
|
|
@ -3529,7 +3529,7 @@ int BcmSetActiveSection(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eF
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
int BcmCopyISO(struct bcm_mini_adapter *Adapter, FLASH2X_COPY_SECTION sCopySectStrut)
|
int BcmCopyISO(struct bcm_mini_adapter *Adapter, struct bcm_flash2x_copy_section sCopySectStrut)
|
||||||
{
|
{
|
||||||
PCHAR Buff = NULL;
|
PCHAR Buff = NULL;
|
||||||
FLASH2X_SECTION_VAL eISOReadPart = 0, eISOWritePart = 0;
|
FLASH2X_SECTION_VAL eISOReadPart = 0, eISOWritePart = 0;
|
||||||
|
|
Loading…
Reference in a new issue