Staging: bcm: Remove typedef for FirmwareInfo and call directly.
This patch removes typedef for FirmwareInfo, changes the name from Firmwareinfo to bcm_firmware_info. In addition, any calls to the following typedefs "PFIRMWARE_INFO, FIRMWARE_INFO" 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:
Родитель
7905c78816
Коммит
7a27a2ccf8
|
@ -535,11 +535,11 @@ struct _ETH_HEADER_STRUC {
|
|||
} __packed;
|
||||
typedef struct _ETH_HEADER_STRUC ETH_HEADER_STRUC, *PETH_HEADER_STRUC;
|
||||
|
||||
typedef struct FirmwareInfo {
|
||||
struct bcm_firmware_info {
|
||||
void __user *pvMappedFirmwareAddress;
|
||||
ULONG u32FirmwareLength;
|
||||
ULONG u32StartingAddress;
|
||||
} __packed FIRMWARE_INFO, *PFIRMWARE_INFO;
|
||||
} __packed;
|
||||
|
||||
/* holds the value of net_device structure.. */
|
||||
extern struct net_device *gblpnetdev;
|
||||
|
|
|
@ -787,7 +787,7 @@ cntrlEnd:
|
|||
}
|
||||
|
||||
case IOCTL_BCM_BUFFER_DOWNLOAD: {
|
||||
FIRMWARE_INFO *psFwInfo = NULL;
|
||||
struct bcm_firmware_info *psFwInfo = NULL;
|
||||
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Starting the firmware download PID =0x%x!!!!\n", current->pid);
|
||||
|
||||
if (!down_trylock(&Adapter->fw_download_sema)) {
|
||||
|
@ -807,7 +807,7 @@ cntrlEnd:
|
|||
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
|
||||
"Length for FW DLD is : %lx\n", IoBuffer.InputLength);
|
||||
|
||||
if (IoBuffer.InputLength > sizeof(FIRMWARE_INFO)) {
|
||||
if (IoBuffer.InputLength > sizeof(struct bcm_firmware_info)) {
|
||||
up(&Adapter->fw_download_sema);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
|
|
@ -132,7 +132,7 @@ exit:
|
|||
return Status;
|
||||
}
|
||||
|
||||
static int bcm_download_config_file(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo)
|
||||
static int bcm_download_config_file(PMINI_ADAPTER Adapter, struct bcm_firmware_info *psFwInfo)
|
||||
{
|
||||
int retval = STATUS_SUCCESS;
|
||||
B_UINT32 value = 0;
|
||||
|
@ -229,7 +229,7 @@ static int bcm_compare_buff_contents(unsigned char *readbackbuff, unsigned char
|
|||
return retval;
|
||||
}
|
||||
|
||||
int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo)
|
||||
int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, struct bcm_firmware_info *psFwInfo)
|
||||
{
|
||||
int retval = STATUS_SUCCESS;
|
||||
PUCHAR buff = NULL;
|
||||
|
|
|
@ -92,7 +92,7 @@ int ProcessGetHostMibs(PMINI_ADAPTER Adapter, S_MIBS_HOST_STATS_MIBS *buf);
|
|||
void GetDroppedAppCntrlPktMibs(S_MIBS_HOST_STATS_MIBS *ioBuffer, PPER_TARANG_DATA pTarang);
|
||||
void beceem_parse_target_struct(PMINI_ADAPTER Adapter);
|
||||
|
||||
int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo);
|
||||
int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, struct bcm_firmware_info *psFwInfo);
|
||||
|
||||
void CopyMIBSExtendedSFParameters(PMINI_ADAPTER Adapter,
|
||||
CServiceFlowParamSI *psfLocalSet, UINT uiSearchRuleIndex);
|
||||
|
|
Загрузка…
Ссылка в новой задаче