Commit 8dbc6aa0 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: Remove dead code macro ASSERT 



ASSERT is always defined as empty macro
because VIAWET_DEBUG is never defined.

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

drivers/staging/vt6656/baseband.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -680,7 +680,6 @@ BBuGetFrameTime( 
    unsigned int uRate = 0;

    unsigned int uRate = 0;





    if (uRateIdx > RATE_54M) {

    if (uRateIdx > RATE_54M) {

        ASSERT(0);

        return 0;

        return 0;

    }

    }

drivers/staging/vt6656/device_cfg.h

+0 −8
Original line number Original line Diff line number Diff line
@@ -83,16 +83,8 @@ typedef enum _chip_type { 
} CHIP_TYPE, *PCHIP_TYPE;

} CHIP_TYPE, *PCHIP_TYPE;





#ifdef VIAWET_DEBUG

#ifdef VIAWET_DEBUG

#define ASSERT(x) { \

    if (!(x)) { \

	printk(KERN_ERR "assertion %s failed: file %s line %d\n", #x, \

        __FUNCTION__, __LINE__);\

	*(int *) 0 = 0;		\

    } \

}

#define DBG_PORT80(value)                   outb(value, 0x80)

#define DBG_PORT80(value)                   outb(value, 0x80)

#else

#else

#define ASSERT(x)

#define DBG_PORT80(value)

#define DBG_PORT80(value)

#endif

#endif

drivers/staging/vt6656/dpc.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -314,7 +314,6 @@ int RXbBulkInProcessData(struct vnt_private *pDevice, PRCB pRCB, 
         (BytesToIndicate < (*pwPLCP_Length)) ) {

         (BytesToIndicate < (*pwPLCP_Length)) ) {





        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Wrong PLCP Length %x\n", (int) *pwPLCP_Length);

        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Wrong PLCP Length %x\n", (int) *pwPLCP_Length);

        ASSERT(0);

        return false;

        return false;

    }

    }

    for ( ii=RATE_1M;ii<MAX_RATE;ii++) {

    for ( ii=RATE_1M;ii<MAX_RATE;ii++) {
@@ -1347,7 +1346,6 @@ void RXvWorkItem(struct vnt_private *pDevice) 
            (pDevice->NumRecvFreeList != 0) ) {

            (pDevice->NumRecvFreeList != 0) ) {

        pRCB = pDevice->FirstRecvFreeList;

        pRCB = pDevice->FirstRecvFreeList;

        pDevice->NumRecvFreeList--;

        pDevice->NumRecvFreeList--;

        ASSERT(pRCB);// cannot be NULL

        DequeueRCB(pDevice->FirstRecvFreeList, pDevice->LastRecvFreeList);

        DequeueRCB(pDevice->FirstRecvFreeList, pDevice->LastRecvFreeList);

        ntStatus = PIPEnsBulkInUsbRead(pDevice, pRCB);

        ntStatus = PIPEnsBulkInUsbRead(pDevice, pRCB);

    }

    }
@@ -1362,9 +1360,6 @@ void RXvFreeRCB(PRCB pRCB, int bReAllocSkb) 




    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->RXvFreeRCB\n");

    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->RXvFreeRCB\n");





    ASSERT(!pRCB->Ref);     // should be 0

    ASSERT(pRCB->pDevice);  // shouldn't be NULL



	if (bReAllocSkb == false) {

	if (bReAllocSkb == false) {

		kfree_skb(pRCB->skb);

		kfree_skb(pRCB->skb);

		bReAllocSkb = true;

		bReAllocSkb = true;
@@ -1411,7 +1406,6 @@ void RXvMngWorkItem(struct vnt_private *pDevice) 
        if(!pRCB){

        if(!pRCB){

            break;

            break;

        }

        }

        ASSERT(pRCB);// cannot be NULL

        pRxPacket = &(pRCB->sMngPacket);

        pRxPacket = &(pRCB->sMngPacket);

	vMgrRxManagePacket(pDevice, &pDevice->vnt_mgmt, pRxPacket);

	vMgrRxManagePacket(pDevice, &pDevice->vnt_mgmt, pRxPacket);

        pRCB->Ref--;

        pRCB->Ref--;

drivers/staging/vt6656/main_usb.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -925,7 +925,6 @@ int device_alloc_frag_buf(struct vnt_private *pDevice, 
    pDeF->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);

    pDeF->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);

    if (pDeF->skb == NULL)

    if (pDeF->skb == NULL)

        return false;

        return false;

    ASSERT(pDeF->skb);

    pDeF->skb->dev = pDevice->dev;

    pDeF->skb->dev = pDevice->dev;





    return true;

    return true;

drivers/staging/vt6656/rxtx.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -538,7 +538,6 @@ static u32 s_uGetDataDuration(struct vnt_private *pDevice, u8 byDurType, 
        break;

        break;

    }

    }





	ASSERT(false);

	return 0;

	return 0;

}

}
@@ -1475,8 +1474,6 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType, 
        memcpy((pbyPayloadHead + cb802_1_H_len), ((u8 *)psEthHeader) + ETH_HLEN, uSkbPacketLen - ETH_HLEN);

        memcpy((pbyPayloadHead + cb802_1_H_len), ((u8 *)psEthHeader) + ETH_HLEN, uSkbPacketLen - ETH_HLEN);

    }

    }





    ASSERT(uLength == cbNdisBodySize);



    if ((bNeedEncryption == true) && (pTransmitKey != NULL) && (pTransmitKey->byCipherSuite == KEY_CTL_TKIP)) {

    if ((bNeedEncryption == true) && (pTransmitKey != NULL) && (pTransmitKey->byCipherSuite == KEY_CTL_TKIP)) {





        ///////////////////////////////////////////////////////////////////

        ///////////////////////////////////////////////////////////////////