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

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



This patch removes typedef for _TARGET_PARAMS, and changes
the name of the struct to bcm_target_params. In addition,
any calls to struct "stTargetParams, TARGET_PARAMS,
*PTARGET_PARAMS, STARGETPARAMS,  or *PSTARGETPARAMS are
changed to call directly.

Signed-off-by: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a637f904

drivers/staging/bcm/Adapter.h

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ struct bcm_mini_adapter { 
	wait_queue_head_t	ioctl_fw_dnld_wait_queue;

	BOOLEAN			waiting_to_fw_download_done;

	pid_t			fw_download_process_pid;

	PSTARGETPARAMS		pstargetparams;

	struct bcm_target_params *pstargetparams;

	BOOLEAN			device_removed;

	BOOLEAN			DeviceAccess;

	BOOLEAN			bIsAutoCorrectEnabled;

drivers/staging/bcm/InterfaceDld.c

+3 −3
Original line number Diff line number Diff line
@@ -138,12 +138,12 @@ static int bcm_download_config_file(struct bcm_mini_adapter *Adapter, struct bcm 
	B_UINT32 value = 0;



	if (Adapter->pstargetparams == NULL) {

		Adapter->pstargetparams = kmalloc(sizeof(STARGETPARAMS), GFP_KERNEL);

		Adapter->pstargetparams = kmalloc(sizeof(struct bcm_target_params), GFP_KERNEL);

		if (Adapter->pstargetparams == NULL)

			return -ENOMEM;

	}



	if (psFwInfo->u32FirmwareLength != sizeof(STARGETPARAMS))

	if (psFwInfo->u32FirmwareLength != sizeof(struct bcm_target_params))

		return -EIO;



	retval = copy_from_user(Adapter->pstargetparams, psFwInfo->pvMappedFirmwareAddress, psFwInfo->u32FirmwareLength);
@@ -195,7 +195,7 @@ static int bcm_download_config_file(struct bcm_mini_adapter *Adapter, struct bcm 
		}

	}



	retval = buffDnldVerify(Adapter, (PUCHAR)Adapter->pstargetparams, sizeof(STARGETPARAMS), CONFIG_BEGIN_ADDR);

	retval = buffDnldVerify(Adapter, (PUCHAR)Adapter->pstargetparams, sizeof(struct bcm_target_params), CONFIG_BEGIN_ADDR);



	if (retval)

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "configuration file not downloaded properly");

drivers/staging/bcm/Misc.c

+4 −4
Original line number Diff line number Diff line
@@ -956,7 +956,7 @@ int InitCardAndDownloadFirmware(struct bcm_mini_adapter *ps_adapter) 
	/* Download cfg file */

	status = buffDnldVerify(ps_adapter,

				(PUCHAR)ps_adapter->pstargetparams,

				sizeof(STARGETPARAMS),

				sizeof(struct bcm_target_params),

				CONFIG_BEGIN_ADDR);

	if (status) {

		BCM_DEBUG_PRINT(ps_adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Error downloading CFG file");
@@ -1053,7 +1053,7 @@ static int bcm_parse_target_params(struct bcm_mini_adapter *Adapter) 
	if (!buff)

		return -ENOMEM;



	Adapter->pstargetparams = kmalloc(sizeof(STARGETPARAMS), GFP_KERNEL);

	Adapter->pstargetparams = kmalloc(sizeof(struct bcm_target_params), GFP_KERNEL);

	if (Adapter->pstargetparams == NULL) {

		kfree(buff);

		return -ENOMEM;
@@ -1070,7 +1070,7 @@ static int bcm_parse_target_params(struct bcm_mini_adapter *Adapter) 
	len = kernel_read(flp, 0, buff, BUFFER_1K);

	filp_close(flp, NULL);



	if (len != sizeof(STARGETPARAMS)) {

	if (len != sizeof(struct bcm_target_params)) {

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "Mismatch in Target Param Structure!\n");

		kfree(buff);

		kfree(Adapter->pstargetparams);
@@ -1082,7 +1082,7 @@ static int bcm_parse_target_params(struct bcm_mini_adapter *Adapter) 
	/*

	 * Values in Adapter->pstargetparams are in network byte order

	 */

	memcpy(Adapter->pstargetparams, buff, sizeof(STARGETPARAMS));

	memcpy(Adapter->pstargetparams, buff, sizeof(struct bcm_target_params));

	kfree(buff);

	beceem_parse_target_struct(Adapter);

	return STATUS_SUCCESS;

drivers/staging/bcm/target_params.h

+2 −2
Original line number Diff line number Diff line 
#ifndef TARGET_PARAMS_H

#define TARGET_PARAMS_H



typedef struct _TARGET_PARAMS {

struct bcm_target_params {

	u32 m_u32CfgVersion;

	u32 m_u32CenterFrequency;

	u32 m_u32BandAScan;
@@ -52,6 +52,6 @@ typedef struct _TARGET_PARAMS { 
	 * bit 16-31 Band AMC Data configuration: Bit 16 = 1 – Band AMC 2x3 support.

	 */

	u32 m_u32BandAMCEnable;

} stTargetParams, TARGET_PARAMS, *PTARGET_PARAMS, STARGETPARAMS, *PSTARGETPARAMS;

};



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE