Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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



This patch removes typedef for _MINI_ADAPTER, changes the
name of the struct from _MINI_ADAPTER to bcm_mini_adapter.
In addition, any calls to the following typedefs
"MINI_ADAPTER, *PMINI_ADAPTER" are changed to call
the struct directly.

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

drivers/staging/bcm/Adapter.h

+6 −7
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ struct bcm_packet_info { 


struct bcm_tarang_data {

	struct bcm_tarang_data	*next;

	struct _MINI_ADAPTER	*Adapter;

	struct bcm_mini_adapter	*Adapter;

	struct sk_buff		*RxAppControlHead;

	struct sk_buff		*RxAppControlTail;

	int			AppCtrlQueueLen;
@@ -208,15 +208,15 @@ struct bcm_targetdsx_buffer { 
	BOOLEAN		valid;

};



typedef int (*FP_FLASH_WRITE)(struct _MINI_ADAPTER *, UINT, PVOID);

typedef int (*FP_FLASH_WRITE)(struct bcm_mini_adapter *, UINT, PVOID);



typedef int (*FP_FLASH_WRITE_STATUS)(struct _MINI_ADAPTER *, UINT, PVOID);

typedef int (*FP_FLASH_WRITE_STATUS)(struct bcm_mini_adapter *, UINT, PVOID);



/*

 * Driver adapter data structure

 */

struct _MINI_ADAPTER {

	struct _MINI_ADAPTER	*next;

struct bcm_mini_adapter {

	struct bcm_mini_adapter	*next;

	struct net_device	*dev;

	u32			msg_enable;

	CHAR			*caDsxReqResp;
@@ -394,7 +394,6 @@ struct _MINI_ADAPTER { 
	UINT			gpioBitMap;

	S_BCM_DEBUG_STATE	stDebugState;

};

typedef struct _MINI_ADAPTER MINI_ADAPTER, *PMINI_ADAPTER;



#define GET_BCM_ADAPTER(net_dev) netdev_priv(net_dev)
@@ -417,7 +416,7 @@ struct bcm_ddr_setting { 
	UINT ulRegAddress;

	UINT ulRegValue;

};

int InitAdapter(PMINI_ADAPTER psAdapter);

int InitAdapter(struct bcm_mini_adapter *psAdapter);



/* =====================================================================

 * Beceem vendor request codes for EP0

drivers/staging/bcm/Bcmchar.c

+6 −6
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


static int bcm_char_open(struct inode *inode, struct file * filp)

{

	PMINI_ADAPTER       Adapter = NULL;

	struct bcm_mini_adapter *Adapter = NULL;

	struct bcm_tarang_data *pTarang = NULL;



	Adapter = GET_BCM_ADAPTER(gblpnetdev);
@@ -44,7 +44,7 @@ static int bcm_char_open(struct inode *inode, struct file * filp) 
static int bcm_char_release(struct inode *inode, struct file *filp)

{

	struct bcm_tarang_data *pTarang, *tmp, *ptmp;

	PMINI_ADAPTER Adapter = NULL;

	struct bcm_mini_adapter *Adapter = NULL;

	struct sk_buff *pkt, *npkt;



	pTarang = (struct bcm_tarang_data *)filp->private_data;
@@ -98,7 +98,7 @@ static ssize_t bcm_char_read(struct file *filp, char __user *buf, size_t size, 
			     loff_t *f_pos)

{

	struct bcm_tarang_data *pTarang = filp->private_data;

	PMINI_ADAPTER	Adapter = pTarang->Adapter;

	struct bcm_mini_adapter *Adapter = pTarang->Adapter;

	struct sk_buff *Packet = NULL;

	ssize_t PktLen = 0;

	int wait_ret_val = 0;
@@ -157,7 +157,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) 
{

	struct bcm_tarang_data *pTarang = filp->private_data;

	void __user *argp = (void __user *)arg;

	PMINI_ADAPTER Adapter = pTarang->Adapter;

	struct bcm_mini_adapter *Adapter = pTarang->Adapter;

	INT Status = STATUS_FAILURE;

	int timeout = 0;

	IOCTL_BUFFER IoBuffer;
@@ -2014,7 +2014,7 @@ static const struct file_operations bcm_fops = { 
	.llseek = no_llseek,

};



int register_control_device_interface(PMINI_ADAPTER Adapter)

int register_control_device_interface(struct bcm_mini_adapter *Adapter)

{



	if (Adapter->major > 0)
@@ -2039,7 +2039,7 @@ int register_control_device_interface(PMINI_ADAPTER Adapter) 
	return 0;

}



void unregister_control_device_interface(PMINI_ADAPTER Adapter)

void unregister_control_device_interface(struct bcm_mini_adapter *Adapter)

{

	if (Adapter->major > 0) {

		device_destroy(bcm_class, MKDEV(Adapter->major, 0));

drivers/staging/bcm/Bcmnet.c

+9 −9
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ struct net_device *gblpnetdev; 


static INT bcm_open(struct net_device *dev)

{

	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);

	struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);



	if (Adapter->fw_download_done == FALSE) {

		pr_notice(PFX "%s: link up failed (download in progress)\n",
@@ -28,7 +28,7 @@ static INT bcm_open(struct net_device *dev) 


static INT bcm_close(struct net_device *dev)

{

	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);

	struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);



	if (netif_msg_ifdown(Adapter))

		pr_info(PFX "%s: disabling interface\n", dev->name);
@@ -59,7 +59,7 @@ static u16 bcm_select_queue(struct net_device *dev, struct sk_buff *skb) 


static netdev_tx_t bcm_transmit(struct sk_buff *skb, struct net_device *dev)

{

	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);

	struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);

	u16 qindex = skb_get_queue_mapping(skb);
@@ -141,7 +141,7 @@ static int bcm_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
static void bcm_get_drvinfo(struct net_device *dev,

			    struct ethtool_drvinfo *info)

{

	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);

	struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);

	PS_INTERFACE_ADAPTER psIntfAdapter = Adapter->pvInterfaceAdapter;

	struct usb_device *udev = interface_to_usbdev(psIntfAdapter->interface);
@@ -156,21 +156,21 @@ static void bcm_get_drvinfo(struct net_device *dev, 


static u32 bcm_get_link(struct net_device *dev)

{

	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);

	struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);



	return Adapter->LinkUpStatus;

}



static u32 bcm_get_msglevel(struct net_device *dev)

{

	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);

	struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);



	return Adapter->msg_enable;

}



static void bcm_set_msglevel(struct net_device *dev, u32 level)

{

	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);

	struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);



	Adapter->msg_enable = level;

}
@@ -183,7 +183,7 @@ static const struct ethtool_ops bcm_ethtool_ops = { 
	.set_msglevel	= bcm_set_msglevel,

};



int register_networkdev(PMINI_ADAPTER Adapter)

int register_networkdev(struct bcm_mini_adapter *Adapter)

{

	struct net_device *net = Adapter->dev;

	PS_INTERFACE_ADAPTER IntfAdapter = Adapter->pvInterfaceAdapter;
@@ -224,7 +224,7 @@ int register_networkdev(PMINI_ADAPTER Adapter) 
	return 0;

}



void unregister_networkdev(PMINI_ADAPTER Adapter)

void unregister_networkdev(struct bcm_mini_adapter *Adapter)

{

	struct net_device *net = Adapter->dev;

	PS_INTERFACE_ADAPTER IntfAdapter = Adapter->pvInterfaceAdapter;

drivers/staging/bcm/CmHost.c

+25 −25
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ enum E_CLASSIFIER_ACTION { 
	eDeleteClassifier

};



static ULONG GetNextTargetBufferLocation(PMINI_ADAPTER Adapter, B_UINT16 tid);

static ULONG GetNextTargetBufferLocation(struct bcm_mini_adapter *Adapter, B_UINT16 tid);



/************************************************************

 * Function - SearchSfid
@@ -28,7 +28,7 @@ static ULONG GetNextTargetBufferLocation(PMINI_ADAPTER Adapter, B_UINT16 tid); 
 * Returns - Queue index for this SFID(If matched)

 *  Else Invalid Queue Index(If Not matched)

 ************************************************************/

int SearchSfid(PMINI_ADAPTER Adapter, UINT uiSfid)

int SearchSfid(struct bcm_mini_adapter *Adapter, UINT uiSfid)

{

	int i;
@@ -49,7 +49,7 @@ int SearchSfid(PMINI_ADAPTER Adapter, UINT uiSfid) 
 * Returns - Queue index for the free SFID

 *  Else returns Invalid Index.

 ****************************************************************/

static int SearchFreeSfid(PMINI_ADAPTER Adapter)

static int SearchFreeSfid(struct bcm_mini_adapter *Adapter)

{

	int i;
@@ -63,12 +63,12 @@ static int SearchFreeSfid(PMINI_ADAPTER Adapter) 
/*

 * Function: SearchClsid

 * Description:	This routinue would search Classifier  having specified ClassifierID as input parameter

 * Input parameters: PMINI_ADAPTER Adapter - Adapter Context

 * Input parameters: struct bcm_mini_adapter *Adapter - Adapter Context

 *  unsigned int uiSfid   - The SF in which the classifier is to searched

 *  B_UINT16  uiClassifierID - The classifier ID to be searched

 * Return: int :Classifier table index of matching entry

 */

static int SearchClsid(PMINI_ADAPTER Adapter, ULONG ulSFID, B_UINT16  uiClassifierID)

static int SearchClsid(struct bcm_mini_adapter *Adapter, ULONG ulSFID, B_UINT16  uiClassifierID)

{

	int i;
@@ -87,7 +87,7 @@ static int SearchClsid(PMINI_ADAPTER Adapter, ULONG ulSFID, B_UINT16 uiClassifi 
 * This routinue would search Free available Classifier entry in classifier table.

 * @return free Classifier Entry index in classifier table for specified SF

 */

static int SearchFreeClsid(PMINI_ADAPTER Adapter /**Adapter Context*/)

static int SearchFreeClsid(struct bcm_mini_adapter *Adapter /**Adapter Context*/)

{

	int i;
@@ -99,7 +99,7 @@ static int SearchFreeClsid(PMINI_ADAPTER Adapter /**Adapter Context*/) 
	return MAX_CLASSIFIERS+1;

}



static VOID deleteSFBySfid(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex)

static VOID deleteSFBySfid(struct bcm_mini_adapter *Adapter, UINT uiSearchRuleIndex)

{

	/* deleting all the packet held in the SF */

	flush_queue(Adapter, uiSearchRuleIndex);
@@ -120,7 +120,7 @@ CopyIpAddrToClassifier(struct bcm_classifier_rule *pstClassifierEntry, 
	UINT nSizeOfIPAddressInBytes = IP_LENGTH_OF_ADDRESS;

	UCHAR *ptrClassifierIpAddress = NULL;

	UCHAR *ptrClassifierIpMask = NULL;

	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);

	struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);



	if (bIpVersion6)

		nSizeOfIPAddressInBytes = IPV6_ADDRESS_SIZEINBYTES;
@@ -214,7 +214,7 @@ CopyIpAddrToClassifier(struct bcm_classifier_rule *pstClassifierEntry, 
	}

}



void ClearTargetDSXBuffer(PMINI_ADAPTER Adapter, B_UINT16 TID, BOOLEAN bFreeAll)

void ClearTargetDSXBuffer(struct bcm_mini_adapter *Adapter, B_UINT16 TID, BOOLEAN bFreeAll)

{

	int i;
@@ -236,7 +236,7 @@ void ClearTargetDSXBuffer(PMINI_ADAPTER Adapter, B_UINT16 TID, BOOLEAN bFreeAll) 
 * @ingroup ctrl_pkt_functions

 * copy classifier rule into the specified SF index

 */

static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter, stConvergenceSLTypes  *psfCSType, UINT uiSearchRuleIndex, UINT nClassifierIndex)

static inline VOID CopyClassifierRuleToSF(struct bcm_mini_adapter *Adapter, stConvergenceSLTypes  *psfCSType, UINT uiSearchRuleIndex, UINT nClassifierIndex)

{

	struct bcm_classifier_rule *pstClassifierEntry = NULL;

	/* VOID *pvPhsContext = NULL; */
@@ -365,7 +365,7 @@ static inline VOID CopyClassifierRuleToSF(PMINI_ADAPTER Adapter, stConvergenceSL 
/*

 * @ingroup ctrl_pkt_functions

 */

static inline VOID DeleteClassifierRuleFromSF(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex, UINT nClassifierIndex)

static inline VOID DeleteClassifierRuleFromSF(struct bcm_mini_adapter *Adapter, UINT uiSearchRuleIndex, UINT nClassifierIndex)

{

	struct bcm_classifier_rule *pstClassifierEntry = NULL;

	B_UINT16 u16PacketClassificationRuleIndex;
@@ -396,7 +396,7 @@ static inline VOID DeleteClassifierRuleFromSF(PMINI_ADAPTER Adapter, UINT uiSear 
/*

 * @ingroup ctrl_pkt_functions

 */

VOID DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex)

VOID DeleteAllClassifiersForSF(struct bcm_mini_adapter *Adapter, UINT uiSearchRuleIndex)

{

	struct bcm_classifier_rule *pstClassifierEntry = NULL;

	int i;
@@ -428,7 +428,7 @@ VOID DeleteAllClassifiersForSF(PMINI_ADAPTER Adapter, UINT uiSearchRuleIndex) 
 * related data into the Adapter structure.

 * @ingroup ctrl_pkt_functions

 */

static VOID CopyToAdapter(register PMINI_ADAPTER Adapter, /* <Pointer to the Adapter structure */

static VOID CopyToAdapter(register struct bcm_mini_adapter *Adapter, /* <Pointer to the Adapter structure */

			register pstServiceFlowParamSI psfLocalSet, /* <Pointer to the ServiceFlowParamSI structure */

			register UINT uiSearchRuleIndex, /* <Index of Queue, to which this data belongs */

			register UCHAR ucDsxType,
@@ -836,7 +836,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer) 
	int nIndex;

	stLocalSFAddIndicationAlt *pstAddIndication;

	UINT nCurClassifierCnt;

	PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);

	struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);



	pstAddIndication = (stLocalSFAddIndicationAlt *)pvBuffer;

	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "======>");
@@ -1325,7 +1325,7 @@ static VOID DumpCmControlPacket(PVOID pvBuffer) 
	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " bValid: 0x%X", pstAddIndication->sfActiveSet.bValid);

}



static inline ULONG RestoreSFParam(PMINI_ADAPTER Adapter, ULONG ulAddrSFParamSet, PUCHAR pucDestBuffer)

static inline ULONG RestoreSFParam(struct bcm_mini_adapter *Adapter, ULONG ulAddrSFParamSet, PUCHAR pucDestBuffer)

{

	UINT  nBytesToRead = sizeof(stServiceFlowParamSI);
@@ -1342,7 +1342,7 @@ static inline ULONG RestoreSFParam(PMINI_ADAPTER Adapter, ULONG ulAddrSFParamSet 
	return 1;

}



static ULONG StoreSFParam(PMINI_ADAPTER Adapter, PUCHAR pucSrcBuffer, ULONG ulAddrSFParamSet)

static ULONG StoreSFParam(struct bcm_mini_adapter *Adapter, PUCHAR pucSrcBuffer, ULONG ulAddrSFParamSet)

{

	UINT nBytesToWrite = sizeof(stServiceFlowParamSI);

	int ret = 0;
@@ -1358,7 +1358,7 @@ static ULONG StoreSFParam(PMINI_ADAPTER Adapter, PUCHAR pucSrcBuffer, ULONG ulAd 
	return 1;

}



ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter, PVOID pvBuffer, UINT *puBufferLength)

ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBuffer, UINT *puBufferLength)

{

	stLocalSFAddIndicationAlt *pstAddIndicationAlt = NULL;

	stLocalSFAddIndication *pstAddIndication = NULL;
@@ -1473,7 +1473,7 @@ ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter, PVOID pvBuffer, UINT 
}



static inline stLocalSFAddIndicationAlt

*RestoreCmControlResponseMessage(register PMINI_ADAPTER Adapter, register PVOID pvBuffer)

*RestoreCmControlResponseMessage(register struct bcm_mini_adapter *Adapter, register PVOID pvBuffer)

{

	ULONG ulStatus = 0;

	stLocalSFAddIndication *pstAddIndication = NULL;
@@ -1551,7 +1551,7 @@ static inline stLocalSFAddIndicationAlt 
	return NULL;

}



ULONG SetUpTargetDsxBuffers(PMINI_ADAPTER Adapter)

ULONG SetUpTargetDsxBuffers(struct bcm_mini_adapter *Adapter)

{

	ULONG ulTargetDsxBuffersBase = 0;

	ULONG ulCntTargetBuffers;
@@ -1598,7 +1598,7 @@ ULONG SetUpTargetDsxBuffers(PMINI_ADAPTER Adapter) 
	return 1;

}



static ULONG GetNextTargetBufferLocation(PMINI_ADAPTER Adapter, B_UINT16 tid)

static ULONG GetNextTargetBufferLocation(struct bcm_mini_adapter *Adapter, B_UINT16 tid)

{

	ULONG ulTargetDSXBufferAddress;

	ULONG ulTargetDsxBufferIndexToUse, ulMaxTry;
@@ -1632,7 +1632,7 @@ static ULONG GetNextTargetBufferLocation(PMINI_ADAPTER Adapter, B_UINT16 tid) 
	return ulTargetDSXBufferAddress;

}



int AllocAdapterDsxBuffer(PMINI_ADAPTER Adapter)

int AllocAdapterDsxBuffer(struct bcm_mini_adapter *Adapter)

{

	/*

	 * Need to Allocate memory to contain the SUPER Large structures
@@ -1645,7 +1645,7 @@ int AllocAdapterDsxBuffer(PMINI_ADAPTER Adapter) 
	return 0;

}



int FreeAdapterDsxBuffer(PMINI_ADAPTER Adapter)

int FreeAdapterDsxBuffer(struct bcm_mini_adapter *Adapter)

{

	kfree(Adapter->caDsxReqResp);

	return 0;
@@ -1657,7 +1657,7 @@ int FreeAdapterDsxBuffer(PMINI_ADAPTER Adapter) 
 * for the Connection Management.

 * @return - Queue index for the free SFID else returns Invalid Index.

 */

BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /* <Pointer to the Adapter structure */

BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter,  /* <Pointer to the Adapter structure */

				PVOID pvBuffer /* Starting Address of the Buffer, that contains the AddIndication Data */)

{

	stServiceFlowParamSI *psfLocalSet = NULL;
@@ -1915,7 +1915,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter, /* <Pointer to the Adap 
	return TRUE;

}



int get_dsx_sf_data_to_application(PMINI_ADAPTER Adapter, UINT uiSFId, void __user *user_buffer)

int get_dsx_sf_data_to_application(struct bcm_mini_adapter *Adapter, UINT uiSFId, void __user *user_buffer)

{

	int status = 0;

	struct bcm_packet_info *psSfInfo = NULL;
@@ -1937,7 +1937,7 @@ int get_dsx_sf_data_to_application(PMINI_ADAPTER Adapter, UINT uiSFId, void __us 
	return STATUS_SUCCESS;

}



VOID OverrideServiceFlowParams(PMINI_ADAPTER Adapter, PUINT puiBuffer)

VOID OverrideServiceFlowParams(struct bcm_mini_adapter *Adapter, PUINT puiBuffer)

{

	B_UINT32 u32NumofSFsinMsg = ntohl(*(puiBuffer + 1));

	stIM_SFHostNotify *pHostInfo = NULL;

drivers/staging/bcm/CmHost.h

+5 −5
Original line number Diff line number Diff line
@@ -148,14 +148,14 @@ typedef struct stLocalSFChangeIndicationAlt{ 


}stLocalSFChangeIndicationAlt;



ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter,PVOID pvBuffer,UINT *puBufferLength);

ULONG StoreCmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBuffer,UINT *puBufferLength);



INT AllocAdapterDsxBuffer(PMINI_ADAPTER Adapter);

INT AllocAdapterDsxBuffer(struct bcm_mini_adapter *Adapter);



INT FreeAdapterDsxBuffer(PMINI_ADAPTER Adapter);

ULONG SetUpTargetDsxBuffers(PMINI_ADAPTER Adapter);

INT FreeAdapterDsxBuffer(struct bcm_mini_adapter *Adapter);

ULONG SetUpTargetDsxBuffers(struct bcm_mini_adapter *Adapter);



BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,PVOID pvBuffer);

BOOLEAN CmControlResponseMessage(struct bcm_mini_adapter *Adapter, PVOID pvBuffer);





#pragma pack (pop)