diff options
| author |   Kevin McKinney <klmckinney1@gmail.com> | 2012-11-22 14:48:44 -0500 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-26 16:05:21 -0800 |
| commit | b1206c091b2dbe9fb7555eb6bc21694ff11b3579 (patch) | |
| tree | 68d8c02264cc50e06c3effbe460c788569a719fa | |
| parent | Staging: bcm: Remove typedef for _SECTION_TYPE. (diff) | |
| download | linux-dev-b1206c091b2dbe9fb7555eb6bc21694ff11b3579.tar.xz linux-dev-b1206c091b2dbe9fb7555eb6bc21694ff11b3579.zip | |
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>
| -rw-r--r-- | drivers/staging/bcm/Bcmchar.c | 4 | ||||
| -rw-r--r-- | drivers/staging/bcm/Ioctl.h | 4 | ||||
| -rw-r--r-- | drivers/staging/bcm/Prototypes.h | 2 | ||||
| -rw-r--r-- | drivers/staging/bcm/nvm.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c index 745a4e298324..1f8495daf31f 100644 --- a/drivers/staging/bcm/Bcmchar.c +++ b/drivers/staging/bcm/Bcmchar.c @@ -1692,7 +1692,7 @@ cntrlEnd: 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 @@ cntrlEnd: 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/drivers/staging/bcm/Ioctl.h b/drivers/staging/bcm/Ioctl.h index eff1404fa2f2..a465d05f99eb 100644 --- a/drivers/staging/bcm/Ioctl.h +++ b/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/drivers/staging/bcm/Prototypes.h b/drivers/staging/bcm/Prototypes.h index 9115f01b4a92..00723589c08e 100644 --- a/drivers/staging/bcm/Prototypes.h +++ b/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/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c index 7f874db1197b..8d3d759e4649 100644 --- a/drivers/staging/bcm/nvm.c +++ b/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; |