Commit 217ed3ab authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: Remove ununsed macro ASSERT 



VIAWET_DEBUG is not defined so macro is empty.

Remove the macro.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 83aa2ac6

drivers/staging/vt6655/baseband.c

+1 −3
Original line number Diff line number Diff line
@@ -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];

drivers/staging/vt6655/card.c

+0 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/staging/vt6655/device_cfg.h

+0 −9
Original line number Diff line number Diff line
@@ -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

drivers/staging/vt6655/device_main.c

+4 −5
Original line number Diff line number Diff line
@@ -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,

drivers/staging/vt6655/mac.c

+0 −1
Original line number Diff line number Diff line
@@ -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);