mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
staging: vt6655: Remove ununsed macro ASSERT
VIAWET_DEBUG is not defined so macro is empty. Remove the macro. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
83aa2ac65a
commit
217ed3abf1
6 changed files with 5 additions and 20 deletions
|
@ -1728,10 +1728,8 @@ BBuGetFrameTime(
|
|||
unsigned int uRateIdx = (unsigned int) wRate;
|
||||
unsigned int uRate = 0;
|
||||
|
||||
if (uRateIdx > RATE_54M) {
|
||||
ASSERT(0);
|
||||
if (uRateIdx > RATE_54M)
|
||||
return 0;
|
||||
}
|
||||
|
||||
uRate = (unsigned int)awcFrameTime[uRateIdx];
|
||||
|
||||
|
|
|
@ -847,7 +847,6 @@ void CARDvSetLoopbackMode(struct vnt_private *priv, unsigned short wLoopbackMode
|
|||
case CARD_LB_PHY:
|
||||
break;
|
||||
default:
|
||||
ASSERT(false);
|
||||
break;
|
||||
}
|
||||
/* set MAC loopback */
|
||||
|
|
|
@ -70,17 +70,8 @@ typedef enum _chip_type {
|
|||
} CHIP_TYPE, *PCHIP_TYPE;
|
||||
|
||||
#ifdef VIAWET_DEBUG
|
||||
#define ASSERT(x) \
|
||||
do { \
|
||||
if (!(x)) { \
|
||||
pr_err("assertion %s failed: file %s line %d\n", \
|
||||
#x, __func__, __LINE__); \
|
||||
*(int *)0 = 0; \
|
||||
} \
|
||||
} while (0)
|
||||
#define DBG_PORT80(value) outb(value, 0x80)
|
||||
#else
|
||||
#define ASSERT(x)
|
||||
#define DBG_PORT80(value)
|
||||
#endif
|
||||
|
||||
|
|
|
@ -623,7 +623,7 @@ static void device_init_rd0_ring(struct vnt_private *pDevice)
|
|||
for (i = 0; i < pDevice->sOpts.nRxDescs0; i ++, curr += sizeof(SRxDesc)) {
|
||||
pDesc = &(pDevice->aRD0Ring[i]);
|
||||
pDesc->pRDInfo = alloc_rd_info();
|
||||
ASSERT(pDesc->pRDInfo);
|
||||
|
||||
if (!device_alloc_rx_buf(pDevice, pDesc))
|
||||
dev_err(&pDevice->pcid->dev, "can not alloc rx bufs\n");
|
||||
|
||||
|
@ -647,7 +647,7 @@ static void device_init_rd1_ring(struct vnt_private *pDevice)
|
|||
for (i = 0; i < pDevice->sOpts.nRxDescs1; i ++, curr += sizeof(SRxDesc)) {
|
||||
pDesc = &(pDevice->aRD1Ring[i]);
|
||||
pDesc->pRDInfo = alloc_rd_info();
|
||||
ASSERT(pDesc->pRDInfo);
|
||||
|
||||
if (!device_alloc_rx_buf(pDevice, pDesc))
|
||||
dev_err(&pDevice->pcid->dev, "can not alloc rx bufs\n");
|
||||
|
||||
|
@ -705,7 +705,7 @@ static void device_init_td0_ring(struct vnt_private *pDevice)
|
|||
for (i = 0; i < pDevice->sOpts.nTxDescs[0]; i++, curr += sizeof(STxDesc)) {
|
||||
pDesc = &(pDevice->apTD0Rings[i]);
|
||||
pDesc->pTDInfo = alloc_td_info();
|
||||
ASSERT(pDesc->pTDInfo);
|
||||
|
||||
if (pDevice->flags & DEVICE_FLAGS_TX_ALIGN) {
|
||||
pDesc->pTDInfo->buf = pDevice->tx0_bufs + (i)*PKT_BUF_SZ;
|
||||
pDesc->pTDInfo->buf_dma = pDevice->tx_bufs_dma0 + (i)*PKT_BUF_SZ;
|
||||
|
@ -731,7 +731,7 @@ static void device_init_td1_ring(struct vnt_private *pDevice)
|
|||
for (i = 0; i < pDevice->sOpts.nTxDescs[1]; i++, curr += sizeof(STxDesc)) {
|
||||
pDesc = &(pDevice->apTD1Rings[i]);
|
||||
pDesc->pTDInfo = alloc_td_info();
|
||||
ASSERT(pDesc->pTDInfo);
|
||||
|
||||
if (pDevice->flags & DEVICE_FLAGS_TX_ALIGN) {
|
||||
pDesc->pTDInfo->buf = pDevice->tx1_bufs + (i) * PKT_BUF_SZ;
|
||||
pDesc->pTDInfo->buf_dma = pDevice->tx_bufs_dma1 + (i) * PKT_BUF_SZ;
|
||||
|
@ -818,7 +818,6 @@ static bool device_alloc_rx_buf(struct vnt_private *pDevice, PSRxDesc pRD)
|
|||
pRDInfo->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);
|
||||
if (pRDInfo->skb == NULL)
|
||||
return false;
|
||||
ASSERT(pRDInfo->skb);
|
||||
|
||||
pRDInfo->skb_dma =
|
||||
dma_map_single(&pDevice->pcid->dev,
|
||||
|
|
|
@ -186,7 +186,6 @@ void MACvSetLoopbackMode(void __iomem *dwIoBase, unsigned char byLoopbackMode)
|
|||
{
|
||||
unsigned char byOrgValue;
|
||||
|
||||
ASSERT(byLoopbackMode < 3);
|
||||
byLoopbackMode <<= 6;
|
||||
/* set TCR */
|
||||
VNSvInPortB(dwIoBase + MAC_REG_TEST, &byOrgValue);
|
||||
|
|
|
@ -387,7 +387,6 @@ s_uGetDataDuration(
|
|||
break;
|
||||
}
|
||||
|
||||
ASSERT(false);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue