Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b35360bc authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: wlags49_h2: remove DBG_ENTER() macro 



We have an in-kernel tracing function, please use that instead of custom
macros.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 064d5a72

drivers/staging/wlags49_h2/debug.h

+0 −8
Original line number Diff line number Diff line
@@ -129,17 +129,10 @@ 
#define _LEAVE_STR          "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"





#define _DBG_ENTER(A)						\

	DBG_PRINT("%s:%.*s:%s\n", DBG_NAME(A), ++DBG_LEVEL(A),	\

		  _ENTER_STR, __func__)

#define _DBG_LEAVE(A)						\

	DBG_PRINT("%s:%.*s:%s\n", DBG_NAME(A), DBG_LEVEL(A)--,	\

		  _LEAVE_STR, __func__)





#define DBG_ENTER(A)        {if (DBG_FLAGS(A) & DBG_TRACE_ON) \

				_DBG_ENTER(A); }



#define DBG_LEAVE(A)        {if (DBG_FLAGS(A) & DBG_TRACE_ON) \

				 _DBG_LEAVE(A); }
@@ -208,7 +201,6 @@ typedef struct { 
#define DBG_DEFN

#define DBG_TRAP

#define DBG_PRINT(S...)

#define DBG_ENTER(A)

#define DBG_LEAVE(A)

#define DBG_PARAM(A, N, F, S...)

#define DBG_ERROR(A, S...)

drivers/staging/wlags49_h2/wl_cs.c

+0 −15
Original line number Diff line number Diff line
@@ -133,9 +133,6 @@ static int wl_adapter_attach(struct pcmcia_device *link) 
	struct net_device   *dev;

	struct wl_private   *lp;

	int ret;

	/*--------------------------------------------------------------------*/



	DBG_ENTER(DbgInfo);



	dev = wl_device_alloc();

	if (dev == NULL) {
@@ -167,9 +164,7 @@ static int wl_adapter_attach(struct pcmcia_device *link) 
static void wl_adapter_detach(struct pcmcia_device *link)

{

	struct net_device   *dev = link->priv;

	/*--------------------------------------------------------------------*/



	DBG_ENTER(DbgInfo);

	DBG_PARAM(DbgInfo, "link", "0x%p", link);



	wl_adapter_release(link);
@@ -186,7 +181,6 @@ static void wl_adapter_detach(struct pcmcia_device *link) 


void wl_adapter_release(struct pcmcia_device *link)

{

	DBG_ENTER(DbgInfo);

	DBG_PARAM(DbgInfo, "link", "0x%p", link);



	/* Stop hardware */
@@ -226,9 +220,7 @@ int wl_adapter_insert(struct pcmcia_device *link) 
{

	struct net_device *dev;

	int ret;

	/*--------------------------------------------------------------------*/



	DBG_ENTER(DbgInfo);

	DBG_PARAM(DbgInfo, "link", "0x%p", link);



	dev     = link->priv;
@@ -299,9 +291,7 @@ int wl_adapter_open(struct net_device *dev) 
	struct pcmcia_device *link = lp->link;

	int result = 0;

	int hcf_status = HCF_SUCCESS;

	/*--------------------------------------------------------------------*/



	DBG_ENTER(DbgInfo);

	DBG_PRINT("%s\n", VERSION_INFO);

	DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev);
@@ -348,9 +338,7 @@ int wl_adapter_close(struct net_device *dev) 
{

	struct wl_private *lp = wl_priv(dev);

	struct pcmcia_device *link = lp->link;

	/*--------------------------------------------------------------------*/



	DBG_ENTER(DbgInfo);

	DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev);



	if (link == NULL) {
@@ -415,9 +403,7 @@ static struct pcmcia_driver wlags49_driver = { 
int wl_adapter_init_module(void)

{

	int ret;

	/*--------------------------------------------------------------------*/



	DBG_ENTER(DbgInfo);

	DBG_TRACE(DbgInfo, "wl_adapter_init_module() -- PCMCIA\n");



	ret = pcmcia_register_driver(&wlags49_driver);
@@ -447,7 +433,6 @@ int wl_adapter_init_module(void) 
 ******************************************************************************/

void wl_adapter_cleanup_module(void)

{

	DBG_ENTER(DbgInfo);

	DBG_TRACE(DbgInfo, "wl_adapter_cleanup_module() -- PCMCIA\n");

drivers/staging/wlags49_h2/wl_main.c

+8 −52
Original line number Diff line number Diff line
@@ -434,8 +434,6 @@ int wl_insert( struct net_device *dev ) 
	int                     i;

	unsigned long           flags = 0;

	struct wl_private       *lp = wl_priv(dev);

	/*------------------------------------------------------------------------*/

	DBG_ENTER( DbgInfo );



	/* Initialize the adapter hardware. */

	memset( &( lp->hcfCtx ), 0, sizeof( IFB_STRCT ));
@@ -971,8 +969,7 @@ int wl_reset(struct net_device *dev) 
{

	struct wl_private  *lp = wl_priv(dev);

	int                 hcf_status = HCF_SUCCESS;

	/*------------------------------------------------------------------------*/

	DBG_ENTER( DbgInfo );



	DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev );

	DBG_PARAM( DbgInfo, "dev->base_addr", "(%#03lx)", dev->base_addr );
@@ -1047,8 +1044,6 @@ int wl_go( struct wl_private *lp ) 
	int  	hcf_status = HCF_SUCCESS;

	char	*cp = NULL;			//fw_image

	int	retries = 0;

	/*------------------------------------------------------------------------*/

	DBG_ENTER( DbgInfo );



	hcf_status = wl_disable( lp );

	if ( hcf_status != HCF_SUCCESS ) {
@@ -1231,8 +1226,7 @@ int rc; 
void wl_set_wep_keys( struct wl_private *lp )

{

	int count = 0;

	/*------------------------------------------------------------------------*/

	DBG_ENTER( DbgInfo );



	DBG_PARAM( DbgInfo, "lp", "%s (0x%p)", lp->dev->name, lp );

	if ( lp->EnableEncryption ) {

		/* NOTE: CFG_CNF_ENCRYPTION is set in wl_put_ltv() as it's a static
@@ -1297,8 +1291,7 @@ void wl_set_wep_keys( struct wl_private *lp ) 
int wl_apply(struct wl_private *lp)

{

	int hcf_status = HCF_SUCCESS;

	/*------------------------------------------------------------------------*/

	DBG_ENTER( DbgInfo );



	DBG_ASSERT( lp != NULL);

	DBG_PARAM( DbgInfo, "lp", "%s (0x%p)", lp->dev->name, lp );
@@ -1370,8 +1363,7 @@ int wl_put_ltv_init( struct wl_private *lp ) 
	int i;

	int hcf_status;

	CFG_RID_LOG_STRCT *RidLog;

	/*------------------------------------------------------------------------*/

	DBG_ENTER( DbgInfo );



	if ( lp == NULL ) {

		DBG_ERROR( DbgInfo, "lp pointer is NULL\n" );

		DBG_LEAVE( DbgInfo );
@@ -1467,8 +1459,6 @@ int wl_put_ltv( struct wl_private *lp ) 
{

	int len;

	int hcf_status;

	/*------------------------------------------------------------------------*/

	DBG_ENTER( DbgInfo );



	if ( lp == NULL ) {

		DBG_ERROR( DbgInfo, "lp pointer is NULL\n" );
@@ -2059,7 +2049,6 @@ static int __init wl_module_init( void ) 
	}

#endif /* DBG */



	DBG_ENTER( DbgInfo );

	printk(KERN_INFO "%s\n", VERSION_INFO);

    	printk(KERN_INFO "*** Modified for kernel 2.6 by Henk de Groot <pe1dnn@amsat.org>\n");

        printk(KERN_INFO "*** Based on 7.18 version by Andrey Borzenkov <arvidjaar@mail.ru> $Revision: 39 $\n");
@@ -2097,8 +2086,6 @@ static int __init wl_module_init( void ) 
 ******************************************************************************/

static void __exit wl_module_exit( void )

{

	DBG_ENTER(DbgInfo);



	wl_adapter_cleanup_module( );

#if 0 //SCULL_USE_PROC /* don't waste space if unused */

	remove_proc_entry( "wlags", NULL );		//;?why so a-symmetric compared to location of proc_create_data
@@ -2313,8 +2300,6 @@ void wl_remove( struct net_device *dev ) 
{

	struct wl_private   *lp = wl_priv(dev);

	unsigned long   flags;

	/*------------------------------------------------------------------------*/

	DBG_ENTER( DbgInfo );



	DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev );
@@ -2384,8 +2369,6 @@ void wl_suspend( struct net_device *dev ) 
{

	struct wl_private  *lp = wl_priv(dev);

	unsigned long   flags;

	/*------------------------------------------------------------------------*/

	DBG_ENTER( DbgInfo );



	DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev );
@@ -2439,8 +2422,6 @@ void wl_resume(struct net_device *dev) 
{

	struct wl_private  *lp = wl_priv(dev);

	unsigned long   flags;

	/*------------------------------------------------------------------------*/

	DBG_ENTER( DbgInfo );



	DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev );
@@ -2492,8 +2473,6 @@ void wl_resume(struct net_device *dev) 
void wl_release( struct net_device *dev )

{

	struct wl_private  *lp = wl_priv(dev);

	/*------------------------------------------------------------------------*/

	DBG_ENTER( DbgInfo );



	DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev );

	/* If wl_remove() hasn't been called (i.e. when Card Services is shut
@@ -2580,8 +2559,6 @@ p_s8 * wl_get_irq_list( void ) 
int wl_enable( struct wl_private *lp )

{

	int hcf_status = HCF_SUCCESS;

	/*------------------------------------------------------------------------*/

	DBG_ENTER( DbgInfo );



	if ( lp->portState == WVLAN_PORT_STATE_ENABLED ) {

		DBG_TRACE( DbgInfo, "No action: Card already enabled\n" );
@@ -2629,7 +2606,6 @@ int wl_enable( struct wl_private *lp ) 
 ******************************************************************************/

void wl_enable_wds_ports( struct wl_private * lp )

{

	DBG_ENTER( DbgInfo );

	if ( CNV_INT_TO_LITTLE( lp->hcfCtx.IFB_FWIdentity.comp_id ) == COMP_ID_FW_AP  ){

		DBG_ERROR( DbgInfo, "!!!!;? someone misunderstood something !!!!!\n" );

	}
@@ -2660,9 +2636,6 @@ void wl_enable_wds_ports( struct wl_private * lp ) 
int wl_connect( struct wl_private *lp )

{

	int hcf_status;

	/*------------------------------------------------------------------------*/



	DBG_ENTER( DbgInfo );



	if ( lp->portState != WVLAN_PORT_STATE_ENABLED ) {

		DBG_TRACE( DbgInfo, "No action: Not in enabled state\n" );
@@ -2699,9 +2672,6 @@ int wl_connect( struct wl_private *lp ) 
int wl_disconnect( struct wl_private *lp )

{

	int hcf_status;

	/*------------------------------------------------------------------------*/



	DBG_ENTER( DbgInfo );



	if ( lp->portState != WVLAN_PORT_STATE_CONNECTED ) {

		DBG_TRACE( DbgInfo, "No action: Not in connected state\n" );
@@ -2739,8 +2709,6 @@ int wl_disconnect( struct wl_private *lp ) 
int wl_disable( struct wl_private *lp )

{

	int hcf_status = HCF_SUCCESS;

	/*------------------------------------------------------------------------*/

	DBG_ENTER( DbgInfo );



	if ( lp->portState == WVLAN_PORT_STATE_DISABLED ) {

		DBG_TRACE( DbgInfo, "No action: Port state is disabled\n" );
@@ -2786,8 +2754,6 @@ int wl_disable( struct wl_private *lp ) 
 ******************************************************************************/

void wl_disable_wds_ports( struct wl_private * lp )

{

	DBG_ENTER( DbgInfo );



	if ( CNV_INT_TO_LITTLE( lp->hcfCtx.IFB_FWIdentity.comp_id ) == COMP_ID_FW_AP  ){

		DBG_ERROR( DbgInfo, "!!!!;? someone misunderstood something !!!!!\n" );

	}
@@ -2827,8 +2793,7 @@ void wl_disable_wds_ports( struct wl_private * lp ) 
int wl_mbx( struct wl_private *lp )

{

	int hcf_status = HCF_SUCCESS;

	/*------------------------------------------------------------------------*/

	DBG_ENTER( DbgInfo );



	DBG_TRACE( DbgInfo, "Mailbox Info: IFB_MBInfoLen: %d\n",

			   lp->hcfCtx.IFB_MBInfoLen );
@@ -2878,7 +2843,6 @@ int wl_mbx( struct wl_private *lp ) 
 ******************************************************************************/

void wl_endian_translate_mailbox( ltv_t *ltv )

{

	DBG_ENTER( DbgInfo );

	switch( ltv->typ ) {

	  case CFG_TALLIES:

		break;
@@ -2993,8 +2957,7 @@ void wl_process_mailbox( struct wl_private *lp ) 
{

	ltv_t   *ltv;

	hcf_16  ltv_val = 0xFFFF;

	/*------------------------------------------------------------------------*/

	DBG_ENTER( DbgInfo );



	ltv = &( lp->ltvRecord );



	switch( ltv->typ ) {
@@ -3452,8 +3415,7 @@ void wl_process_mailbox( struct wl_private *lp ) 
void wl_wds_netdev_register( struct wl_private *lp )

{

	int count;

	/*------------------------------------------------------------------------*/

	DBG_ENTER( DbgInfo );



	//;?why is there no USE_WDS clause like in wl_enable_wds_ports

	if ( CNV_INT_TO_LITTLE( lp->hcfCtx.IFB_FWIdentity.comp_id ) == COMP_ID_FW_AP  ) {

		for( count = 0; count < NUM_WDS_PORTS; count++ ) {
@@ -3498,8 +3460,7 @@ void wl_wds_netdev_register( struct wl_private *lp ) 
void wl_wds_netdev_deregister( struct wl_private *lp )

{

	int count;

	/*------------------------------------------------------------------------*/

	DBG_ENTER( DbgInfo );



	if ( CNV_INT_TO_LITTLE( lp->hcfCtx.IFB_FWIdentity.comp_id ) == COMP_ID_FW_AP  ) {

		for( count = 0; count < NUM_WDS_PORTS; count++ ) {

			if ( WVLAN_VALID_MAC_ADDRESS( lp->wds_port[count].wdsAddress )) {
@@ -3753,8 +3714,6 @@ static int write_int(struct file *file, const char *buffer, unsigned long count, 
	static char		proc_number[11];

	unsigned int	nr = 0;



	DBG_ENTER( DbgInfo );



	if (count > 9) {

		count = -EINVAL;

	} else if ( copy_from_user(proc_number, buffer, count) ) {
@@ -3811,9 +3770,6 @@ void timer_oor( u_long arg ) 
{

	struct wl_private       *lp = (struct wl_private *)arg;



    /*------------------------------------------------------------------------*/



    DBG_ENTER( DbgInfo );

    DBG_PARAM( DbgInfo, "arg", "0x%08lx", arg );



	printk(KERN_NOTICE "timer_oor: %ld 0x%04X\n", jiffies, lp->timer_oor_cnt );		//;?remove me 1 day

drivers/staging/wlags49_h2/wl_netdev.c

+0 −33
Original line number Diff line number Diff line
@@ -170,9 +170,6 @@ int wl_init( struct net_device *dev ) 
{

//    unsigned long       flags;

//    struct wl_private   *lp = wl_priv(dev);

    /*------------------------------------------------------------------------*/



    DBG_ENTER( DbgInfo );



    DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev );
@@ -207,8 +204,6 @@ int wl_init( struct net_device *dev ) 
 ******************************************************************************/

int wl_config( struct net_device *dev, struct ifmap *map )

{

    DBG_ENTER( DbgInfo );



    DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev );

    DBG_PARAM( DbgInfo, "map", "0x%p", map );
@@ -247,9 +242,7 @@ struct net_device_stats *wl_stats( struct net_device *dev ) 
    unsigned long               flags;

    struct net_device_stats     *pStats;

    struct wl_private           *lp = wl_priv(dev);

    /*------------------------------------------------------------------------*/



    //DBG_ENTER( DbgInfo );

    //DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev );



    pStats = NULL;
@@ -312,9 +305,6 @@ int wl_open(struct net_device *dev) 
    int                 status = HCF_SUCCESS;

    struct wl_private   *lp = wl_priv(dev);

    unsigned long       flags;

    /*------------------------------------------------------------------------*/



    DBG_ENTER( DbgInfo );



    wl_lock( lp, &flags );
@@ -407,9 +397,7 @@ int wl_close( struct net_device *dev ) 
{

    struct wl_private   *lp = wl_priv(dev);

    unsigned long   flags;

    /*------------------------------------------------------------------------*/



    DBG_ENTER(DbgInfo);

    DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev);



    /* Mark the adapter as busy */
@@ -499,9 +487,7 @@ int wl_ioctl( struct net_device *dev, struct ifreq *rq, int cmd ) 
    struct wl_private  *lp = wl_priv(dev);

    unsigned long           flags;

    int                     ret = 0;

    /*------------------------------------------------------------------------*/



    DBG_ENTER(DbgInfo);

    DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev);

    DBG_PARAM(DbgInfo, "rq", "0x%p", rq);

    DBG_PARAM(DbgInfo, "cmd", "0x%04x", cmd);
@@ -600,9 +586,6 @@ void wl_tx_timeout( struct net_device *dev ) 
    unsigned long           flags;

    struct wl_private       *lp = wl_priv(dev);

    struct net_device_stats *pStats = NULL;

    /*------------------------------------------------------------------------*/



    DBG_ENTER( DbgInfo );



    DBG_WARNING( DbgInfo, "%s: Transmit timeout.\n", dev->name );
@@ -1035,9 +1018,7 @@ void wl_multicast( struct net_device *dev ) 
    struct netdev_hw_addr *ha;

    struct wl_private   *lp = wl_priv(dev);

    unsigned long       flags;

    /*------------------------------------------------------------------------*/



    DBG_ENTER( DbgInfo );

    DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev );



    if( !wl_adapter_is_open( dev )) {
@@ -1142,8 +1123,6 @@ void wl_multicast( struct net_device *dev ) 


void wl_multicast( struct net_device *dev, int num_addrs, void *addrs )

{

    DBG_ENTER(DbgInfo);



    DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev );

    DBG_PARAM( DbgInfo, "num_addrs", "%d", num_addrs );

    DBG_PARAM( DbgInfo, "addrs", "0x%p", addrs );
@@ -1199,9 +1178,6 @@ struct net_device * wl_device_alloc( void ) 
{

    struct net_device   *dev = NULL;

    struct wl_private   *lp = NULL;

    /*------------------------------------------------------------------------*/



    DBG_ENTER( DbgInfo );



    /* Alloc a net_device struct */

    dev = alloc_etherdev(sizeof(struct wl_private));
@@ -1264,9 +1240,6 @@ struct net_device * wl_device_alloc( void ) 
void wl_device_dealloc( struct net_device *dev )

{

//    struct wl_private   *lp = wl_priv(dev);

    /*------------------------------------------------------------------------*/



    DBG_ENTER( DbgInfo );



    /* Dealloc the WDS ports */

    WL_WDS_DEVICE_DEALLOC( lp );
@@ -1480,9 +1453,6 @@ int wl_tx_port6( struct sk_buff *skb, struct net_device *dev ) 
void wl_wds_device_alloc( struct wl_private *lp )

{

    int count;

    /*------------------------------------------------------------------------*/



    DBG_ENTER( DbgInfo );



    /* WDS support requires additional net_device structs to be allocated,

       so that user space apps can use these virtual devices to specify the
@@ -1550,9 +1520,6 @@ void wl_wds_device_alloc( struct wl_private *lp ) 
void wl_wds_device_dealloc( struct wl_private *lp )

{

    int count;

    /*------------------------------------------------------------------------*/



    DBG_ENTER( DbgInfo );



    for( count = 0; count < NUM_WDS_PORTS; count++ ) {

        struct net_device *dev_wds = NULL;

drivers/staging/wlags49_h2/wl_pci.c

+0 −48
Original line number Diff line number Diff line
@@ -188,9 +188,7 @@ static struct pci_driver wl_driver = { 
int wl_adapter_init_module( void )

{

    int result;

    /*------------------------------------------------------------------------*/



    DBG_ENTER( DbgInfo );

    DBG_TRACE( DbgInfo, "wl_adapter_init_module() -- PCI\n" );



    result = pci_register_driver( &wl_driver ); //;?replace with pci_module_init, Rubini pg 490
@@ -221,9 +219,6 @@ int wl_adapter_init_module( void ) 
void wl_adapter_cleanup_module( void )

{

	//;?how come wl_adapter_cleanup_module is located in a seemingly pci specific module

    DBG_ENTER( DbgInfo );



	//;?DBG_TRACE below feels like nearly redundant in the light of DBG_ENTER above

    DBG_TRACE( DbgInfo, "wl_adapter_cleanup_module() -- PCI\n" );



    pci_unregister_driver( &wl_driver );
@@ -253,9 +248,6 @@ void wl_adapter_cleanup_module( void ) 
int wl_adapter_insert( struct net_device *dev )

{

    int result = FALSE;

    /*------------------------------------------------------------------------*/



    DBG_ENTER( DbgInfo );



    DBG_TRACE( DbgInfo, "wl_adapter_insert() -- PCI\n" );
@@ -294,9 +286,6 @@ int wl_adapter_open( struct net_device *dev ) 
{

    int         result = 0;

    int         hcf_status = HCF_SUCCESS;

    /*------------------------------------------------------------------------*/



    DBG_ENTER( DbgInfo );



    DBG_TRACE( DbgInfo, "wl_adapter_open() -- PCI\n" );
@@ -330,8 +319,6 @@ int wl_adapter_open( struct net_device *dev ) 
 ******************************************************************************/

int wl_adapter_close( struct net_device *dev )

{

    DBG_ENTER( DbgInfo );



    DBG_TRACE( DbgInfo, "wl_adapter_close() -- PCI\n" );

    DBG_TRACE( DbgInfo, "%s: Shutting down adapter.\n", dev->name );
@@ -396,9 +383,7 @@ int wl_pci_probe( struct pci_dev *pdev, 
                                const struct pci_device_id *ent )

{

    int result;

    /*------------------------------------------------------------------------*/



    DBG_ENTER( DbgInfo );

	DBG_PRINT( "%s\n", VERSION_INFO );



    result = wl_pci_setup( pdev );
@@ -431,9 +416,6 @@ int wl_pci_probe( struct pci_dev *pdev, 
void wl_pci_remove(struct pci_dev *pdev)

{

    struct net_device       *dev = NULL;

    /*------------------------------------------------------------------------*/



    DBG_ENTER( DbgInfo );



    /* Make sure the pci_dev pointer passed in is valid */

    if( pdev == NULL ) {
@@ -485,9 +467,6 @@ int wl_pci_setup( struct pci_dev *pdev ) 
    int                 result = 0;

    struct net_device   *dev = NULL;

    struct wl_private   *lp = NULL;

    /*------------------------------------------------------------------------*/



    DBG_ENTER( DbgInfo );



    /* Make sure the pci_dev pointer passed in is valid */

    if( pdev == NULL ) {
@@ -602,9 +581,6 @@ void wl_pci_enable_cardbus_interrupts( struct pci_dev *pdev ) 
    u32                 mem_addr_bus;

    u32                 func_evt_mask_reg;

    void                *mem_addr_kern = NULL;

    /*------------------------------------------------------------------------*/



    DBG_ENTER( DbgInfo );



    /* Initialize to known bad values */

    bar2_reg = 0xdeadbeef;
@@ -665,9 +641,6 @@ int wl_pci_dma_alloc( struct pci_dev *pdev, struct wl_private *lp ) 
{

    int i;

    int status = 0;

    /*------------------------------------------------------------------------*/



    DBG_ENTER( DbgInfo );



//     lp->dma.tx_rsc_ind = lp->dma.rx_rsc_ind = 0;

//
@@ -735,9 +708,6 @@ int wl_pci_dma_free( struct pci_dev *pdev, struct wl_private *lp ) 
{

    int i;

    int status = 0;

    /*------------------------------------------------------------------------*/



    DBG_ENTER( DbgInfo );



    /* Reclaim all Rx packets that were handed over to the HCF */

    /* Do I need to do this? Before this free is called, I've already disabled
@@ -1101,9 +1071,6 @@ int wl_pci_dma_alloc_desc( struct pci_dev *pdev, struct wl_private *lp, 
{

//     int         status = 0;

//     dma_addr_t  pa;

//     /*------------------------------------------------------------------------*/

//

//     DBG_ENTER( DbgInfo );

//

//     if( desc == NULL ) {

//         status = -EFAULT;
@@ -1185,9 +1152,6 @@ int wl_pci_dma_alloc_buf( struct pci_dev *pdev, struct wl_private *lp, 
{

    int         status = 0;

    dma_addr_t  pa;

    /*------------------------------------------------------------------------*/



//     DBG_ENTER( DbgInfo );

//

//     if( desc == NULL ) {

//         status = -EFAULT;
@@ -1282,9 +1246,6 @@ int wl_pci_dma_free_buf( struct pci_dev *pdev, struct wl_private *lp, 
void wl_pci_dma_hcf_supply( struct wl_private *lp )

{

    int i;

    /*------------------------------------------------------------------------*/



    DBG_ENTER( DbgInfo );



    //if( lp->dma.status == 0 );

    //{
@@ -1344,9 +1305,6 @@ void wl_pci_dma_hcf_supply( struct wl_private *lp ) 
void wl_pci_dma_hcf_reclaim( struct wl_private *lp )

{

    int i;

    /*------------------------------------------------------------------------*/



    DBG_ENTER( DbgInfo );



    wl_pci_dma_hcf_reclaim_rx( lp );

    for( i = 0; i < NUM_RX_DESC; i++ ) {
@@ -1391,9 +1349,6 @@ void wl_pci_dma_hcf_reclaim_rx( struct wl_private *lp ) 
{

    int         i;

    DESC_STRCT *p;

    /*------------------------------------------------------------------------*/



    DBG_ENTER( DbgInfo );



    //if( lp->dma.status == 0 )

    //{
@@ -1521,9 +1476,6 @@ void wl_pci_dma_hcf_reclaim_tx( struct wl_private *lp ) 
{

    int         i;

    DESC_STRCT *p;

    /*------------------------------------------------------------------------*/



    DBG_ENTER( DbgInfo );



    //if( lp->dma.status == 0 )

    //{