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

Commit 16834405 authored by Guillaume Clement's avatar Guillaume Clement Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: change type of PortOffset to void __iomem * 



PortOffset was an unsigned long, but used as an pointer to io
memory. Sometimes it was not properly cast before use, which caused
many warning by sparse.

By updating its type to void __iomem *, and reflecting the changes
where it is needed, this removes most of those warnings.

Signed-off-by: default avatarGuillaume Clement <gclement@baobob.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c49d4b96

drivers/staging/vt6655/baseband.c

+15 −15
Original line number Diff line number Diff line
@@ -1987,7 +1987,7 @@ BBvCalculateParameter( 
 * Return Value: true if succeeded; false if failed.

 *

 */

bool BBbReadEmbedded(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char *pbyData)

bool BBbReadEmbedded(void __iomem *dwIoBase, unsigned char byBBAddr, unsigned char *pbyData)

{

	unsigned short ww;

	unsigned char byValue;
@@ -2029,7 +2029,7 @@ bool BBbReadEmbedded(unsigned long dwIoBase, unsigned char byBBAddr, unsigned ch 
 * Return Value: true if succeeded; false if failed.

 *

 */

bool BBbWriteEmbedded(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byData)

bool BBbWriteEmbedded(void __iomem *dwIoBase, unsigned char byBBAddr, unsigned char byData)

{

	unsigned short ww;

	unsigned char byValue;
@@ -2070,7 +2070,7 @@ bool BBbWriteEmbedded(unsigned long dwIoBase, unsigned char byBBAddr, unsigned c 
 * Return Value: true if all TestBits are set; false otherwise.

 *

 */

bool BBbIsRegBitsOn(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits)

bool BBbIsRegBitsOn(void __iomem *dwIoBase, unsigned char byBBAddr, unsigned char byTestBits)

{

	unsigned char byOrgData;
@@ -2092,7 +2092,7 @@ bool BBbIsRegBitsOn(unsigned long dwIoBase, unsigned char byBBAddr, unsigned cha 
 * Return Value: true if all TestBits are clear; false otherwise.

 *

 */

bool BBbIsRegBitsOff(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits)

bool BBbIsRegBitsOff(void __iomem *dwIoBase, unsigned char byBBAddr, unsigned char byTestBits)

{

	unsigned char byOrgData;
@@ -2119,7 +2119,7 @@ bool BBbVT3253Init(PSDevice pDevice) 
{

	bool bResult = true;

	int        ii;

	unsigned long dwIoBase = pDevice->PortOffset;

	void __iomem *dwIoBase = pDevice->PortOffset;

	unsigned char byRFType = pDevice->byRFType;

	unsigned char byLocalID = pDevice->byLocalID;
@@ -2285,7 +2285,7 @@ bool BBbVT3253Init(PSDevice pDevice) 
 * Return Value: none

 *

 */

void BBvReadAllRegs(unsigned long dwIoBase, unsigned char *pbyBBRegs)

void BBvReadAllRegs(void __iomem *dwIoBase, unsigned char *pbyBBRegs)

{

	int  ii;

	unsigned char byBase = 1;
@@ -2312,7 +2312,7 @@ void BBvReadAllRegs(unsigned long dwIoBase, unsigned char *pbyBBRegs) 
void BBvLoopbackOn(PSDevice pDevice)

{

	unsigned char byData;

	unsigned long dwIoBase = pDevice->PortOffset;

	void __iomem *dwIoBase = pDevice->PortOffset;



	/* CR C9 = 0x00 */

	BBbReadEmbedded(dwIoBase, 0xC9, &pDevice->byBBCRc9); /* CR201 */
@@ -2365,7 +2365,7 @@ void BBvLoopbackOn(PSDevice pDevice) 
void BBvLoopbackOff(PSDevice pDevice)

{

	unsigned char byData;

	unsigned long dwIoBase = pDevice->PortOffset;

	void __iomem *dwIoBase = pDevice->PortOffset;



	BBbWriteEmbedded(dwIoBase, 0xC9, pDevice->byBBCRc9); /* CR201 */

	BBbWriteEmbedded(dwIoBase, 0x88, pDevice->byBBCR88); /* CR136 */
@@ -2448,7 +2448,7 @@ void BBvSetVGAGainOffset(PSDevice pDevice, unsigned char byData) 
 *

 */

void

BBvSoftwareReset(unsigned long dwIoBase)

BBvSoftwareReset(void __iomem *dwIoBase)

{

	BBbWriteEmbedded(dwIoBase, 0x50, 0x40);

	BBbWriteEmbedded(dwIoBase, 0x50, 0);
@@ -2469,7 +2469,7 @@ BBvSoftwareReset(unsigned long dwIoBase) 
 *

 */

void

BBvPowerSaveModeON(unsigned long dwIoBase)

BBvPowerSaveModeON(void __iomem *dwIoBase)

{

	unsigned char byOrgData;
@@ -2491,7 +2491,7 @@ BBvPowerSaveModeON(unsigned long dwIoBase) 
 *

 */

void

BBvPowerSaveModeOFF(unsigned long dwIoBase)

BBvPowerSaveModeOFF(void __iomem *dwIoBase)

{

	unsigned char byOrgData;
@@ -2515,7 +2515,7 @@ BBvPowerSaveModeOFF(unsigned long dwIoBase) 
 */



void

BBvSetTxAntennaMode(unsigned long dwIoBase, unsigned char byAntennaMode)

BBvSetTxAntennaMode(void __iomem *dwIoBase, unsigned char byAntennaMode)

{

	unsigned char byBBTxConf;
@@ -2548,7 +2548,7 @@ BBvSetTxAntennaMode(unsigned long dwIoBase, unsigned char byAntennaMode) 
 */



void

BBvSetRxAntennaMode(unsigned long dwIoBase, unsigned char byAntennaMode)

BBvSetRxAntennaMode(void __iomem *dwIoBase, unsigned char byAntennaMode)

{

	unsigned char byBBRxConf;
@@ -2578,14 +2578,14 @@ BBvSetRxAntennaMode(unsigned long dwIoBase, unsigned char byAntennaMode) 
 *

 */

void

BBvSetDeepSleep(unsigned long dwIoBase, unsigned char byLocalID)

BBvSetDeepSleep(void __iomem *dwIoBase, unsigned char byLocalID)

{

	BBbWriteEmbedded(dwIoBase, 0x0C, 0x17); /* CR12 */

	BBbWriteEmbedded(dwIoBase, 0x0D, 0xB9); /* CR13 */

}



void

BBvExitDeepSleep(unsigned long dwIoBase, unsigned char byLocalID)

BBvExitDeepSleep(void __iomem *dwIoBase, unsigned char byLocalID)

{

	BBbWriteEmbedded(dwIoBase, 0x0C, 0x00); /* CR12 */

	BBbWriteEmbedded(dwIoBase, 0x0D, 0x01); /* CR13 */

drivers/staging/vt6655/baseband.h

+12 −12
Original line number Diff line number Diff line
@@ -99,26 +99,26 @@ BBvCalculateParameter( 
	unsigned char *pbyPhySgn

);



bool BBbReadEmbedded(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char *pbyData);

bool BBbWriteEmbedded(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byData);

bool BBbReadEmbedded(void __iomem *dwIoBase, unsigned char byBBAddr, unsigned char *pbyData);

bool BBbWriteEmbedded(void __iomem *dwIoBase, unsigned char byBBAddr, unsigned char byData);



void BBvReadAllRegs(unsigned long dwIoBase, unsigned char *pbyBBRegs);

void BBvReadAllRegs(void __iomem *dwIoBase, unsigned char *pbyBBRegs);

void BBvLoopbackOn(PSDevice pDevice);

void BBvLoopbackOff(PSDevice pDevice);

void BBvSetShortSlotTime(PSDevice pDevice);

bool BBbIsRegBitsOn(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits);

bool BBbIsRegBitsOff(unsigned long dwIoBase, unsigned char byBBAddr, unsigned char byTestBits);

bool BBbIsRegBitsOn(void __iomem *dwIoBase, unsigned char byBBAddr, unsigned char byTestBits);

bool BBbIsRegBitsOff(void __iomem *dwIoBase, unsigned char byBBAddr, unsigned char byTestBits);

void BBvSetVGAGainOffset(PSDevice pDevice, unsigned char byData);



// VT3253 Baseband

bool BBbVT3253Init(PSDevice pDevice);

void BBvSoftwareReset(unsigned long dwIoBase);

void BBvPowerSaveModeON(unsigned long dwIoBase);

void BBvPowerSaveModeOFF(unsigned long dwIoBase);

void BBvSetTxAntennaMode(unsigned long dwIoBase, unsigned char byAntennaMode);

void BBvSetRxAntennaMode(unsigned long dwIoBase, unsigned char byAntennaMode);

void BBvSetDeepSleep(unsigned long dwIoBase, unsigned char byLocalID);

void BBvExitDeepSleep(unsigned long dwIoBase, unsigned char byLocalID);

void BBvSoftwareReset(void __iomem *dwIoBase);

void BBvPowerSaveModeON(void __iomem *dwIoBase);

void BBvPowerSaveModeOFF(void __iomem *dwIoBase);

void BBvSetTxAntennaMode(void __iomem *dwIoBase, unsigned char byAntennaMode);

void BBvSetRxAntennaMode(void __iomem *dwIoBase, unsigned char byAntennaMode);

void BBvSetDeepSleep(void __iomem *dwIoBase, unsigned char byLocalID);

void BBvExitDeepSleep(void __iomem *dwIoBase, unsigned char byLocalID);



// timer for antenna diversity

drivers/staging/vt6655/card.c

+4 −4
Original line number Diff line number Diff line
@@ -1891,7 +1891,7 @@ unsigned char CARDbyGetPktType(void *pDeviceHandler) 
 * Return Value: none

 *

 */

void CARDvSetLoopbackMode(unsigned long dwIoBase, unsigned short wLoopbackMode)

void CARDvSetLoopbackMode(void __iomem *dwIoBase, unsigned short wLoopbackMode)

{

	switch (wLoopbackMode) {

	case CARD_LB_NONE:
@@ -1980,7 +1980,7 @@ QWORD CARDqGetTSFOffset(unsigned char byRxRate, QWORD qwTSF1, QWORD qwTSF2) 
 * Return Value: true if success; otherwise false

 *

 */

bool CARDbGetCurrentTSF(unsigned long dwIoBase, PQWORD pqwCurrTSF)

bool CARDbGetCurrentTSF(void __iomem *dwIoBase, PQWORD pqwCurrTSF)

{

	unsigned short ww;

	unsigned char byData;
@@ -2053,7 +2053,7 @@ QWORD CARDqGetNextTBTT(QWORD qwTSF, unsigned short wBeaconInterval) 
 * Return Value: none

 *

 */

void CARDvSetFirstNextTBTT(unsigned long dwIoBase, unsigned short wBeaconInterval)

void CARDvSetFirstNextTBTT(void __iomem *dwIoBase, unsigned short wBeaconInterval)

{

	QWORD   qwNextTBTT;
@@ -2084,7 +2084,7 @@ void CARDvSetFirstNextTBTT(unsigned long dwIoBase, unsigned short wBeaconInterva 
 * Return Value: none

 *

 */

void CARDvUpdateNextTBTT(unsigned long dwIoBase, QWORD qwTSF, unsigned short wBeaconInterval)

void CARDvUpdateNextTBTT(void __iomem *dwIoBase, QWORD qwTSF, unsigned short wBeaconInterval)

{

	qwTSF = CARDqGetNextTBTT(qwTSF, wBeaconInterval);

	// Set NextTBTT

drivers/staging/vt6655/card.h

+4 −4
Original line number Diff line number Diff line
@@ -89,11 +89,11 @@ void vUpdateIFS(void *pDeviceHandler); 
void CARDvUpdateBasicTopRate(void *pDeviceHandler);

bool CARDbAddBasicRate(void *pDeviceHandler, unsigned short wRateIdx);

bool CARDbIsOFDMinBasicRate(void *pDeviceHandler);

void CARDvSetLoopbackMode(unsigned long dwIoBase, unsigned short wLoopbackMode);

void CARDvSetLoopbackMode(void __iomem *dwIoBase, unsigned short wLoopbackMode);

bool CARDbSoftwareReset(void *pDeviceHandler);

void CARDvSetFirstNextTBTT(unsigned long dwIoBase, unsigned short wBeaconInterval);

void CARDvUpdateNextTBTT(unsigned long dwIoBase, QWORD qwTSF, unsigned short wBeaconInterval);

bool CARDbGetCurrentTSF(unsigned long dwIoBase, PQWORD pqwCurrTSF);

void CARDvSetFirstNextTBTT(void __iomem *dwIoBase, unsigned short wBeaconInterval);

void CARDvUpdateNextTBTT(void __iomem *dwIoBase, QWORD qwTSF, unsigned short wBeaconInterval);

bool CARDbGetCurrentTSF(void __iomem *dwIoBase, PQWORD pqwCurrTSF);

QWORD CARDqGetNextTBTT(QWORD qwTSF, unsigned short wBeaconInterval);

QWORD CARDqGetTSFOffset(unsigned char byRxRate, QWORD qwTSF1, QWORD qwTSF2);

bool CARDbSetTxPower(void *pDeviceHandler, unsigned long ulTxPower);

drivers/staging/vt6655/device.h

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ typedef struct __device_info { 


	CHIP_TYPE                   chip_id;



	unsigned long               PortOffset;

	void __iomem                *PortOffset;

	unsigned long dwIsr;

	u32                         memaddr;

	u32                         ioaddr;