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

Commit 9f1c75ac authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

staging/bcm: fix most build warnings 



This removes all warnings I get on a 64 bit build except
for those that look unfixable, where we convert a pointer
to a 32 bit integer and change its byte order!

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2a953cfd

drivers/staging/bcm/Bcmchar.c

+7 −8
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static int bcm_char_release(struct inode *inode, struct file *filp) 
    return 0;

}



static int bcm_char_read(struct file *filp, PCHAR buf, size_t size, loff_t *f_pos)

static ssize_t bcm_char_read(struct file *filp, char __user *buf, size_t size, loff_t *f_pos)

{

    PPER_TARANG_DATA pTarang = (PPER_TARANG_DATA)filp->private_data;

	PMINI_ADAPTER	Adapter = pTarang->Adapter;
@@ -153,8 +153,7 @@ static int bcm_char_read(struct file *filp, PCHAR buf, size_t size, loff_t *f_po 
    return PktLen;

}



static INT bcm_char_ioctl(struct inode *inode, struct file *filp,

					UINT cmd, ULONG arg)

static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)

{

    PPER_TARANG_DATA  pTarang = (PPER_TARANG_DATA)filp->private_data;

	PMINI_ADAPTER 	Adapter = pTarang->Adapter;

drivers/staging/bcm/Bcmnet.c

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ int register_networkdev(PMINI_ADAPTER Adapter) 
{

	int result=0;

#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)

	int *temp = NULL ;

	void **temp = NULL; /* actually we're *allocating* the device in alloc_etherdev */

#endif

	Adapter->dev = alloc_etherdev(sizeof(PMINI_ADAPTER));

	if(!Adapter->dev)
@@ -139,7 +139,7 @@ int register_networkdev(PMINI_ADAPTER Adapter) 
	Adapter->dev->priv      			= Adapter;

#else

	temp = netdev_priv(Adapter->dev);

	*temp = (UINT)Adapter;

	*temp = (void *)Adapter;

#endif

	//BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "init adapterptr: %x %x\n", (UINT)Adapter, temp);

drivers/staging/bcm/CmHost.c

+5 −5
Original line number Diff line number Diff line
@@ -1792,8 +1792,8 @@ ULONG StoreCmControlResponseMessage(PMINI_ADAPTER Adapter,PVOID pvBuffer,UINT *p 
				(ULONG)pstAddIndication->psfAuthorizedSet)!= 1)

		return 0;



	pstAddIndication->psfAuthorizedSet = (stServiceFlowParamSI *)

				ntohl((ULONG)pstAddIndication->psfAuthorizedSet);

	/* this can't possibly be right */

	pstAddIndication->psfAuthorizedSet = (stServiceFlowParamSI *)ntohl((ULONG)pstAddIndication->psfAuthorizedSet);



	if(pstAddIndicationAlt->u8Type == DSA_REQ)

	{
@@ -1886,9 +1886,9 @@ static inline stLocalSFAddIndicationAlt 
	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "AddIndication-u8TID : 0x%X",ntohs(pstAddIndication->u16TID));

	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "AddIndication-u8CID : 0x%X",ntohs(pstAddIndication->u16CID));

	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "AddIndication-u16VCID : 0x%X",ntohs(pstAddIndication->u16VCID));

	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "AddIndication-autorized set loc : 0x%x",ntohl(pstAddIndication->psfAuthorizedSet));

	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "AddIndication-admitted set loc : 0x%x",ntohl(pstAddIndication->psfAdmittedSet));

	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "AddIndication-Active set loc : 0x%x",ntohl(pstAddIndication->psfActiveSet));

	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "AddIndication-autorized set loc : %p",pstAddIndication->psfAuthorizedSet);

	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "AddIndication-admitted set loc : %p",pstAddIndication->psfAdmittedSet);

	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "AddIndication-Active set loc : %p",pstAddIndication->psfActiveSet);



	pstAddIndicationDest->u8Type = pstAddIndication->u8Type;

	pstAddIndicationDest->u8Direction = pstAddIndication->eConnectionDir;

drivers/staging/bcm/InterfaceInit.c

+2 −2
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ usbbcm_device_probe(struct usb_interface *intf, const struct usb_device_id *id) 
	psIntfAdapter->interface = intf;

	usb_set_intfdata(intf, psIntfAdapter);



	BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "psIntfAdapter 0x%x",(unsigned int)psIntfAdapter);

	BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "psIntfAdapter 0x%p",psIntfAdapter);

	retval = InterfaceAdapterInit(psIntfAdapter);

	if(retval)

	{
@@ -323,7 +323,7 @@ static void usbbcm_disconnect (struct usb_interface *intf) 
		return;

	}

	psIntfAdapter = usb_get_intfdata(intf);

	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "psIntfAdapter 0x%x",(unsigned int)psIntfAdapter);

	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "psIntfAdapter 0x%p",psIntfAdapter);

	if(psIntfAdapter == NULL)

	{

		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "InterfaceAdapter pointer is NULL");

drivers/staging/bcm/LeakyBucket.c

+10 −10
Original line number Diff line number Diff line
@@ -80,9 +80,9 @@ static __inline ULONG GetSFTokenCount(PMINI_ADAPTER Adapter, PacketInfo *psSF) 
	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "IsPacketAllowedForFlow ===>");

	/* Validate the parameters */

	if(NULL == Adapter || (psSF < Adapter->PackInfo &&

		(UINT)psSF > (UINT) &Adapter->PackInfo[HiPriority]))

		(uintptr_t)psSF > (uintptr_t) &Adapter->PackInfo[HiPriority]))

	{

		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "IPAFF: Got wrong Parameters:Adapter: %p, QIndex: %d\n", Adapter, (psSF-Adapter->PackInfo));

		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "IPAFF: Got wrong Parameters:Adapter: %p, QIndex: %ld\n", Adapter, (psSF-Adapter->PackInfo));

		return 0;

	}
@@ -94,14 +94,14 @@ static __inline ULONG GetSFTokenCount(PMINI_ADAPTER Adapter, PacketInfo *psSF) 
		}

		else

		{

			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "Not enough tokens in queue %d Available %u\n",

			BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "Not enough tokens in queue %ld Available %u\n",

				psSF-Adapter->PackInfo, psSF->uiCurrentTokenCount);

			psSF->uiPendedLast = 1;

		}

	}

	else

	{

		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "IPAFF: Queue %d not valid\n", psSF-Adapter->PackInfo);

		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "IPAFF: Queue %ld not valid\n", psSF-Adapter->PackInfo);

	}

	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TOKEN_COUNTS, DBG_LVL_ALL, "IsPacketAllowedForFlow <===");

	return 0;
@@ -113,12 +113,12 @@ static __inline void RemovePacketFromQueue(PacketInfo *pPackInfo , struct sk_buf 
	psQueueCurrent = pPackInfo->FirstTxQueue;

	while(psQueueCurrent)

	{

		if((UINT)Packet == (UINT)psQueueCurrent)

		if(Packet == psQueueCurrent)

		{

			if((UINT)psQueueCurrent == (UINT)pPackInfo->FirstTxQueue)

			if(psQueueCurrent == pPackInfo->FirstTxQueue)

			{

				pPackInfo->FirstTxQueue=psQueueCurrent->next;

				if((UINT)psQueueCurrent==(UINT)pPackInfo->LastTxQueue)

				if(psQueueCurrent==pPackInfo->LastTxQueue)

					pPackInfo->LastTxQueue=NULL;

			}

			else
@@ -189,8 +189,8 @@ static __inline VOID CheckAndSendPacketFromIndex 
	int				iPacketLen=0;





	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "%d ====>", (psSF-Adapter->PackInfo));

	if(((UINT)psSF != (UINT)&Adapter->PackInfo[HiPriority]) && Adapter->LinkUpStatus && atomic_read(&psSF->uiPerSFTxResourceCount))//Get data packet

	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "%ld ====>", (psSF-Adapter->PackInfo));

	if((psSF != &Adapter->PackInfo[HiPriority]) && Adapter->LinkUpStatus && atomic_read(&psSF->uiPerSFTxResourceCount))//Get data packet

  	{

		if(!psSF->ucDirection )

			return;
@@ -240,7 +240,7 @@ static __inline VOID CheckAndSendPacketFromIndex 
			}

			else

			{

				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "For Queue: %d\n", psSF-Adapter->PackInfo);

				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "For Queue: %ld\n", psSF-Adapter->PackInfo);

				BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "\nAvailable Tokens = %d required = %d\n",

					psSF->uiCurrentTokenCount, iPacketLen);

				//this part indicates that becuase of non-availability of the tokens