aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6655/mac.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/vt6655/mac.c')
-rw-r--r--drivers/staging/vt6655/mac.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c
index 9721c2234bf2..80cced7dfda8 100644
--- a/drivers/staging/vt6655/mac.c
+++ b/drivers/staging/vt6655/mac.c
@@ -57,7 +57,7 @@
bool MACbIsRegBitsOff(struct vnt_private *priv, unsigned char byRegOfs,
unsigned char byTestBits)
{
- void __iomem *io_base = priv->PortOffset;
+ void __iomem *io_base = priv->port_offset;
return !(ioread8(io_base + byRegOfs) & byTestBits);
}
@@ -77,7 +77,7 @@ bool MACbIsRegBitsOff(struct vnt_private *priv, unsigned char byRegOfs,
*/
bool MACbIsIntDisable(struct vnt_private *priv)
{
- void __iomem *io_base = priv->PortOffset;
+ void __iomem *io_base = priv->port_offset;
if (ioread32(io_base + MAC_REG_IMR))
return false;
@@ -102,7 +102,7 @@ bool MACbIsIntDisable(struct vnt_private *priv)
void MACvSetShortRetryLimit(struct vnt_private *priv,
unsigned char byRetryLimit)
{
- void __iomem *io_base = priv->PortOffset;
+ void __iomem *io_base = priv->port_offset;
/* set SRT */
iowrite8(byRetryLimit, io_base + MAC_REG_SRT);
}
@@ -124,7 +124,7 @@ void MACvSetShortRetryLimit(struct vnt_private *priv,
void MACvSetLongRetryLimit(struct vnt_private *priv,
unsigned char byRetryLimit)
{
- void __iomem *io_base = priv->PortOffset;
+ void __iomem *io_base = priv->port_offset;
/* set LRT */
iowrite8(byRetryLimit, io_base + MAC_REG_LRT);
}
@@ -145,7 +145,7 @@ void MACvSetLongRetryLimit(struct vnt_private *priv,
*/
void MACvSetLoopbackMode(struct vnt_private *priv, unsigned char byLoopbackMode)
{
- void __iomem *io_base = priv->PortOffset;
+ void __iomem *io_base = priv->port_offset;
byLoopbackMode <<= 6;
/* set TCR */
@@ -168,7 +168,7 @@ void MACvSetLoopbackMode(struct vnt_private *priv, unsigned char byLoopbackMode)
*/
void MACvSaveContext(struct vnt_private *priv, unsigned char *cxt_buf)
{
- void __iomem *io_base = priv->PortOffset;
+ void __iomem *io_base = priv->port_offset;
/* read page0 register */
memcpy_fromio(cxt_buf, io_base, MAC_MAX_CONTEXT_SIZE_PAGE0);
@@ -198,7 +198,7 @@ void MACvSaveContext(struct vnt_private *priv, unsigned char *cxt_buf)
*/
void MACvRestoreContext(struct vnt_private *priv, unsigned char *cxt_buf)
{
- void __iomem *io_base = priv->PortOffset;
+ void __iomem *io_base = priv->port_offset;
MACvSelectPage1(io_base);
/* restore page1 */
@@ -249,7 +249,7 @@ void MACvRestoreContext(struct vnt_private *priv, unsigned char *cxt_buf)
*/
bool MACbSoftwareReset(struct vnt_private *priv)
{
- void __iomem *io_base = priv->PortOffset;
+ void __iomem *io_base = priv->port_offset;
unsigned short ww;
/* turn on HOSTCR_SOFTRST, just write 0x01 to reset */
@@ -312,7 +312,7 @@ bool MACbSafeSoftwareReset(struct vnt_private *priv)
*/
bool MACbSafeRxOff(struct vnt_private *priv)
{
- void __iomem *io_base = priv->PortOffset;
+ void __iomem *io_base = priv->port_offset;
unsigned short ww;
/* turn off wow temp for turn off Rx safely */
@@ -366,7 +366,7 @@ bool MACbSafeRxOff(struct vnt_private *priv)
*/
bool MACbSafeTxOff(struct vnt_private *priv)
{
- void __iomem *io_base = priv->PortOffset;
+ void __iomem *io_base = priv->port_offset;
unsigned short ww;
/* Clear TX DMA */
@@ -422,7 +422,7 @@ bool MACbSafeTxOff(struct vnt_private *priv)
*/
bool MACbSafeStop(struct vnt_private *priv)
{
- void __iomem *io_base = priv->PortOffset;
+ void __iomem *io_base = priv->port_offset;
MACvRegBitsOff(io_base, MAC_REG_TCR, TCR_AUTOBCNTX);
@@ -457,7 +457,7 @@ bool MACbSafeStop(struct vnt_private *priv)
*/
bool MACbShutdown(struct vnt_private *priv)
{
- void __iomem *io_base = priv->PortOffset;
+ void __iomem *io_base = priv->port_offset;
/* disable MAC IMR */
MACvIntDisable(io_base);
MACvSetLoopbackMode(priv, MAC_LB_INTERNAL);
@@ -485,7 +485,7 @@ bool MACbShutdown(struct vnt_private *priv)
*/
void MACvInitialize(struct vnt_private *priv)
{
- void __iomem *io_base = priv->PortOffset;
+ void __iomem *io_base = priv->port_offset;
/* clear sticky bits */
MACvClearStckDS(io_base);
/* disable force PME-enable */
@@ -517,7 +517,7 @@ void MACvInitialize(struct vnt_private *priv)
*/
void MACvSetCurrRx0DescAddr(struct vnt_private *priv, u32 curr_desc_addr)
{
- void __iomem *io_base = priv->PortOffset;
+ void __iomem *io_base = priv->port_offset;
unsigned short ww;
unsigned char org_dma_ctl;
@@ -551,7 +551,7 @@ void MACvSetCurrRx0DescAddr(struct vnt_private *priv, u32 curr_desc_addr)
*/
void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 curr_desc_addr)
{
- void __iomem *io_base = priv->PortOffset;
+ void __iomem *io_base = priv->port_offset;
unsigned short ww;
unsigned char org_dma_ctl;
@@ -586,7 +586,7 @@ void MACvSetCurrRx1DescAddr(struct vnt_private *priv, u32 curr_desc_addr)
void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv,
u32 curr_desc_addr)
{
- void __iomem *io_base = priv->PortOffset;
+ void __iomem *io_base = priv->port_offset;
unsigned short ww;
unsigned char org_dma_ctl;
@@ -622,7 +622,7 @@ void MACvSetCurrTx0DescAddrEx(struct vnt_private *priv,
void MACvSetCurrAC0DescAddrEx(struct vnt_private *priv,
u32 curr_desc_addr)
{
- void __iomem *io_base = priv->PortOffset;
+ void __iomem *io_base = priv->port_offset;
unsigned short ww;
unsigned char org_dma_ctl;
@@ -666,7 +666,7 @@ void MACvSetCurrTXDescAddr(int iTxType, struct vnt_private *priv,
*/
void MACvTimer0MicroSDelay(struct vnt_private *priv, unsigned int uDelay)
{
- void __iomem *io_base = priv->PortOffset;
+ void __iomem *io_base = priv->port_offset;
unsigned char byValue;
unsigned int uu, ii;
@@ -703,7 +703,7 @@ void MACvTimer0MicroSDelay(struct vnt_private *priv, unsigned int uDelay)
void MACvOneShotTimer1MicroSec(struct vnt_private *priv,
unsigned int uDelayTime)
{
- void __iomem *io_base = priv->PortOffset;
+ void __iomem *io_base = priv->port_offset;
iowrite8(0, io_base + MAC_REG_TMCTL1);
iowrite32(uDelayTime, io_base + MAC_REG_TMDATA1);
@@ -713,7 +713,7 @@ void MACvOneShotTimer1MicroSec(struct vnt_private *priv,
void MACvSetMISCFifo(struct vnt_private *priv, unsigned short offset,
u32 data)
{
- void __iomem *io_base = priv->PortOffset;
+ void __iomem *io_base = priv->port_offset;
if (offset > 273)
return;
@@ -724,7 +724,7 @@ void MACvSetMISCFifo(struct vnt_private *priv, unsigned short offset,
bool MACbPSWakeup(struct vnt_private *priv)
{
- void __iomem *io_base = priv->PortOffset;
+ void __iomem *io_base = priv->port_offset;
unsigned int ww;
/* Read PSCTL */
if (MACbIsRegBitsOff(priv, MAC_REG_PSCTL, PSCTL_PS))
@@ -763,14 +763,14 @@ bool MACbPSWakeup(struct vnt_private *priv)
void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl,
unsigned int uEntryIdx, unsigned int uKeyIdx,
unsigned char *pbyAddr, u32 *pdwKey,
- unsigned char byLocalID)
+ unsigned char local_id)
{
- void __iomem *io_base = priv->PortOffset;
+ void __iomem *io_base = priv->port_offset;
unsigned short offset;
u32 data;
int ii;
- if (byLocalID <= 1)
+ if (local_id <= 1)
return;
offset = MISCFIFO_KEYETRY0;
@@ -830,7 +830,7 @@ void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl,
*/
void MACvDisableKeyEntry(struct vnt_private *priv, unsigned int uEntryIdx)
{
- void __iomem *io_base = priv->PortOffset;
+ void __iomem *io_base = priv->port_offset;
unsigned short offset;
offset = MISCFIFO_KEYETRY0;