Commit fd43585b authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6655: remove unused DBG_PORT80 and VIAWET_DEBUG

VIAWET_DEBUG is never defined so DBG_PORT80 is empty and never used.

Remove both macros.
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 217ed3ab
...@@ -1943,7 +1943,6 @@ bool BBbReadEmbedded(struct vnt_private *priv, ...@@ -1943,7 +1943,6 @@ bool BBbReadEmbedded(struct vnt_private *priv,
VNSvInPortB(dwIoBase + MAC_REG_BBREGDATA, pbyData); VNSvInPortB(dwIoBase + MAC_REG_BBREGDATA, pbyData);
if (ww == W_MAX_TIMEOUT) { if (ww == W_MAX_TIMEOUT) {
DBG_PORT80(0x30);
pr_debug(" DBG_PORT80(0x30)\n"); pr_debug(" DBG_PORT80(0x30)\n");
return false; return false;
} }
...@@ -1986,7 +1985,6 @@ bool BBbWriteEmbedded(struct vnt_private *priv, ...@@ -1986,7 +1985,6 @@ bool BBbWriteEmbedded(struct vnt_private *priv,
} }
if (ww == W_MAX_TIMEOUT) { if (ww == W_MAX_TIMEOUT) {
DBG_PORT80(0x31);
pr_debug(" DBG_PORT80(0x31)\n"); pr_debug(" DBG_PORT80(0x31)\n");
return false; return false;
} }
......
...@@ -69,10 +69,4 @@ typedef enum _chip_type { ...@@ -69,10 +69,4 @@ typedef enum _chip_type {
VT3253 = 1 VT3253 = 1
} CHIP_TYPE, *PCHIP_TYPE; } CHIP_TYPE, *PCHIP_TYPE;
#ifdef VIAWET_DEBUG
#define DBG_PORT80(value) outb(value, 0x80)
#else
#define DBG_PORT80(value)
#endif
#endif #endif
...@@ -373,7 +373,6 @@ bool MACbSafeRxOff(void __iomem *dwIoBase) ...@@ -373,7 +373,6 @@ bool MACbSafeRxOff(void __iomem *dwIoBase)
break; break;
} }
if (ww == W_MAX_TIMEOUT) { if (ww == W_MAX_TIMEOUT) {
DBG_PORT80(0x10);
pr_debug(" DBG_PORT80(0x10)\n"); pr_debug(" DBG_PORT80(0x10)\n");
return false; return false;
} }
...@@ -383,7 +382,6 @@ bool MACbSafeRxOff(void __iomem *dwIoBase) ...@@ -383,7 +382,6 @@ bool MACbSafeRxOff(void __iomem *dwIoBase)
break; break;
} }
if (ww == W_MAX_TIMEOUT) { if (ww == W_MAX_TIMEOUT) {
DBG_PORT80(0x11);
pr_debug(" DBG_PORT80(0x11)\n"); pr_debug(" DBG_PORT80(0x11)\n");
return false; return false;
} }
...@@ -397,7 +395,6 @@ bool MACbSafeRxOff(void __iomem *dwIoBase) ...@@ -397,7 +395,6 @@ bool MACbSafeRxOff(void __iomem *dwIoBase)
break; break;
} }
if (ww == W_MAX_TIMEOUT) { if (ww == W_MAX_TIMEOUT) {
DBG_PORT80(0x12);
pr_debug(" DBG_PORT80(0x12)\n"); pr_debug(" DBG_PORT80(0x12)\n");
return false; return false;
} }
...@@ -435,7 +432,6 @@ bool MACbSafeTxOff(void __iomem *dwIoBase) ...@@ -435,7 +432,6 @@ bool MACbSafeTxOff(void __iomem *dwIoBase)
break; break;
} }
if (ww == W_MAX_TIMEOUT) { if (ww == W_MAX_TIMEOUT) {
DBG_PORT80(0x20);
pr_debug(" DBG_PORT80(0x20)\n"); pr_debug(" DBG_PORT80(0x20)\n");
return false; return false;
} }
...@@ -445,7 +441,6 @@ bool MACbSafeTxOff(void __iomem *dwIoBase) ...@@ -445,7 +441,6 @@ bool MACbSafeTxOff(void __iomem *dwIoBase)
break; break;
} }
if (ww == W_MAX_TIMEOUT) { if (ww == W_MAX_TIMEOUT) {
DBG_PORT80(0x21);
pr_debug(" DBG_PORT80(0x21)\n"); pr_debug(" DBG_PORT80(0x21)\n");
return false; return false;
} }
...@@ -460,7 +455,6 @@ bool MACbSafeTxOff(void __iomem *dwIoBase) ...@@ -460,7 +455,6 @@ bool MACbSafeTxOff(void __iomem *dwIoBase)
break; break;
} }
if (ww == W_MAX_TIMEOUT) { if (ww == W_MAX_TIMEOUT) {
DBG_PORT80(0x24);
pr_debug(" DBG_PORT80(0x24)\n"); pr_debug(" DBG_PORT80(0x24)\n");
return false; return false;
} }
...@@ -485,13 +479,11 @@ bool MACbSafeStop(void __iomem *dwIoBase) ...@@ -485,13 +479,11 @@ bool MACbSafeStop(void __iomem *dwIoBase)
MACvRegBitsOff(dwIoBase, MAC_REG_TCR, TCR_AUTOBCNTX); MACvRegBitsOff(dwIoBase, MAC_REG_TCR, TCR_AUTOBCNTX);
if (!MACbSafeRxOff(dwIoBase)) { if (!MACbSafeRxOff(dwIoBase)) {
DBG_PORT80(0xA1);
pr_debug(" MACbSafeRxOff == false)\n"); pr_debug(" MACbSafeRxOff == false)\n");
MACbSafeSoftwareReset(dwIoBase); MACbSafeSoftwareReset(dwIoBase);
return false; return false;
} }
if (!MACbSafeTxOff(dwIoBase)) { if (!MACbSafeTxOff(dwIoBase)) {
DBG_PORT80(0xA2);
pr_debug(" MACbSafeTxOff == false)\n"); pr_debug(" MACbSafeTxOff == false)\n");
MACbSafeSoftwareReset(dwIoBase); MACbSafeSoftwareReset(dwIoBase);
return false; return false;
...@@ -589,9 +581,6 @@ void MACvSetCurrRx0DescAddr(void __iomem *dwIoBase, unsigned long dwCurrDescAddr ...@@ -589,9 +581,6 @@ void MACvSetCurrRx0DescAddr(void __iomem *dwIoBase, unsigned long dwCurrDescAddr
break; break;
} }
if (ww == W_MAX_TIMEOUT)
DBG_PORT80(0x13);
VNSvOutPortD(dwIoBase + MAC_REG_RXDMAPTR0, dwCurrDescAddr); VNSvOutPortD(dwIoBase + MAC_REG_RXDMAPTR0, dwCurrDescAddr);
if (byOrgDMACtl & DMACTL_RUN) if (byOrgDMACtl & DMACTL_RUN)
VNSvOutPortB(dwIoBase + MAC_REG_RXDMACTL0, DMACTL_RUN); VNSvOutPortB(dwIoBase + MAC_REG_RXDMACTL0, DMACTL_RUN);
...@@ -626,8 +615,6 @@ void MACvSetCurrRx1DescAddr(void __iomem *dwIoBase, unsigned long dwCurrDescAddr ...@@ -626,8 +615,6 @@ void MACvSetCurrRx1DescAddr(void __iomem *dwIoBase, unsigned long dwCurrDescAddr
if (!(byData & DMACTL_RUN)) if (!(byData & DMACTL_RUN))
break; break;
} }
if (ww == W_MAX_TIMEOUT)
DBG_PORT80(0x14);
VNSvOutPortD(dwIoBase + MAC_REG_RXDMAPTR1, dwCurrDescAddr); VNSvOutPortD(dwIoBase + MAC_REG_RXDMAPTR1, dwCurrDescAddr);
if (byOrgDMACtl & DMACTL_RUN) if (byOrgDMACtl & DMACTL_RUN)
...@@ -665,8 +652,6 @@ void MACvSetCurrTx0DescAddrEx(void __iomem *dwIoBase, ...@@ -665,8 +652,6 @@ void MACvSetCurrTx0DescAddrEx(void __iomem *dwIoBase,
if (!(byData & DMACTL_RUN)) if (!(byData & DMACTL_RUN))
break; break;
} }
if (ww == W_MAX_TIMEOUT)
DBG_PORT80(0x25);
VNSvOutPortD(dwIoBase + MAC_REG_TXDMAPTR0, dwCurrDescAddr); VNSvOutPortD(dwIoBase + MAC_REG_TXDMAPTR0, dwCurrDescAddr);
if (byOrgDMACtl & DMACTL_RUN) if (byOrgDMACtl & DMACTL_RUN)
...@@ -705,7 +690,6 @@ void MACvSetCurrAC0DescAddrEx(void __iomem *dwIoBase, ...@@ -705,7 +690,6 @@ void MACvSetCurrAC0DescAddrEx(void __iomem *dwIoBase,
break; break;
} }
if (ww == W_MAX_TIMEOUT) { if (ww == W_MAX_TIMEOUT) {
DBG_PORT80(0x26);
pr_debug(" DBG_PORT80(0x26)\n"); pr_debug(" DBG_PORT80(0x26)\n");
} }
VNSvOutPortD(dwIoBase + MAC_REG_AC0DMAPTR, dwCurrDescAddr); VNSvOutPortD(dwIoBase + MAC_REG_AC0DMAPTR, dwCurrDescAddr);
...@@ -806,7 +790,6 @@ bool MACbPSWakeup(void __iomem *dwIoBase) ...@@ -806,7 +790,6 @@ bool MACbPSWakeup(void __iomem *dwIoBase)
break; break;
} }
if (ww == W_MAX_TIMEOUT) { if (ww == W_MAX_TIMEOUT) {
DBG_PORT80(0x36);
pr_debug(" DBG_PORT80(0x33)\n"); pr_debug(" DBG_PORT80(0x33)\n");
return false; return false;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment