From 106b5395552b22c6130bbefac9e0d4d8d8b391f2 Mon Sep 17 00:00:00 2001 From: Kevin McKinney Date: Thu, 22 Nov 2012 14:48:44 -0500 Subject: [PATCH] --- yaml --- r: 338169 b: refs/heads/master c: b1206c091b2dbe9fb7555eb6bc21694ff11b3579 h: refs/heads/master i: 338167: 9af9508cf5ce6b26c47a1ccc2e82d9ddb922b6ef v: v3 --- [refs] | 2 +- trunk/drivers/staging/bcm/Bcmchar.c | 4 ++-- trunk/drivers/staging/bcm/Ioctl.h | 4 ++-- trunk/drivers/staging/bcm/Prototypes.h | 2 +- trunk/drivers/staging/bcm/nvm.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 2c39cb7a9f50..d8a626d05c21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b99b9d5538f0a32dea6e1d79a04233514920b61 +refs/heads/master: b1206c091b2dbe9fb7555eb6bc21694ff11b3579 diff --git a/trunk/drivers/staging/bcm/Bcmchar.c b/trunk/drivers/staging/bcm/Bcmchar.c index 745a4e298324..1f8495daf31f 100644 --- a/trunk/drivers/staging/bcm/Bcmchar.c +++ b/trunk/drivers/staging/bcm/Bcmchar.c @@ -1692,7 +1692,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) break; case IOCTL_BCM_COPY_SECTION: { - FLASH2X_COPY_SECTION sCopySectStrut = {0}; + struct bcm_flash2x_copy_section sCopySectStrut = {0}; Status = STATUS_SUCCESS; BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_COPY_SECTION Called"); @@ -1708,7 +1708,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 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) { BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of Copy_Section_Struct failed with Status :%d", Status); return -EFAULT; diff --git a/trunk/drivers/staging/bcm/Ioctl.h b/trunk/drivers/staging/bcm/Ioctl.h index eff1404fa2f2..a465d05f99eb 100644 --- a/trunk/drivers/staging/bcm/Ioctl.h +++ b/trunk/drivers/staging/bcm/Ioctl.h @@ -167,12 +167,12 @@ typedef struct _FLASH2X_READWRITE { * 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 DstSection; u32 offset; u32 numOfBytes; -} FLASH2X_COPY_SECTION, *PFLASH2X_COPY_SECTION; +}; /* * This section provide the complete bitmap of the Flash. diff --git a/trunk/drivers/staging/bcm/Prototypes.h b/trunk/drivers/staging/bcm/Prototypes.h index 9115f01b4a92..00723589c08e 100644 --- a/trunk/drivers/staging/bcm/Prototypes.h +++ b/trunk/drivers/staging/bcm/Prototypes.h @@ -186,7 +186,7 @@ INT BcmSetActiveSection(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eF INT BcmAllocFlashCSStructure(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 BcmFlash2xWriteSig(struct bcm_mini_adapter *Adapter, FLASH2X_SECTION_VAL eFlashSectionVal); INT validateFlash2xReadWrite(struct bcm_mini_adapter *Adapter, PFLASH2X_READWRITE psFlash2xReadWrite); diff --git a/trunk/drivers/staging/bcm/nvm.c b/trunk/drivers/staging/bcm/nvm.c index 7f874db1197b..8d3d759e4649 100644 --- a/trunk/drivers/staging/bcm/nvm.c +++ b/trunk/drivers/staging/bcm/nvm.c @@ -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; FLASH2X_SECTION_VAL eISOReadPart = 0, eISOWritePart = 0;