Commit 3c319c96 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

staging: wlags49_h2: remove DBG_LEAVE()

We have an in-kernel tracing function, use that instead if you really
need to figure out when functions are called and exited.
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b35360bc
...@@ -125,17 +125,6 @@ ...@@ -125,17 +125,6 @@
#endif /* DBG_TRAP */ #endif /* DBG_TRAP */
#define _ENTER_STR ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
#define _LEAVE_STR "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
#define _DBG_LEAVE(A) \
DBG_PRINT("%s:%.*s:%s\n", DBG_NAME(A), DBG_LEVEL(A)--, \
_LEAVE_STR, __func__)
#define DBG_LEAVE(A) {if (DBG_FLAGS(A) & DBG_TRACE_ON) \
_DBG_LEAVE(A); }
#define DBG_PARAM(A, N, F, S...) {if (DBG_FLAGS(A) & DBG_PARAM_ON) \ #define DBG_PARAM(A, N, F, S...) {if (DBG_FLAGS(A) & DBG_PARAM_ON) \
DBG_PRINT(" %s -- "F"\n", N, S); } DBG_PRINT(" %s -- "F"\n", N, S); }
...@@ -201,7 +190,6 @@ typedef struct { ...@@ -201,7 +190,6 @@ typedef struct {
#define DBG_DEFN #define DBG_DEFN
#define DBG_TRAP #define DBG_TRAP
#define DBG_PRINT(S...) #define DBG_PRINT(S...)
#define DBG_LEAVE(A)
#define DBG_PARAM(A, N, F, S...) #define DBG_PARAM(A, N, F, S...)
#define DBG_ERROR(A, S...) #define DBG_ERROR(A, S...)
#define DBG_WARNING(A, S...) #define DBG_WARNING(A, S...)
......
...@@ -154,7 +154,6 @@ static int wl_adapter_attach(struct pcmcia_device *link) ...@@ -154,7 +154,6 @@ static int wl_adapter_attach(struct pcmcia_device *link)
if (ret != 0) if (ret != 0)
wl_device_dealloc(dev); wl_device_dealloc(dev);
DBG_LEAVE(DbgInfo);
return ret; return ret;
} /* wl_adapter_attach */ } /* wl_adapter_attach */
/*============================================================================*/ /*============================================================================*/
...@@ -173,8 +172,6 @@ static void wl_adapter_detach(struct pcmcia_device *link) ...@@ -173,8 +172,6 @@ static void wl_adapter_detach(struct pcmcia_device *link)
unregister_netdev(dev); unregister_netdev(dev);
wl_device_dealloc(dev); wl_device_dealloc(dev);
} }
DBG_LEAVE(DbgInfo);
} /* wl_adapter_detach */ } /* wl_adapter_detach */
/*============================================================================*/ /*============================================================================*/
...@@ -187,8 +184,6 @@ void wl_adapter_release(struct pcmcia_device *link) ...@@ -187,8 +184,6 @@ void wl_adapter_release(struct pcmcia_device *link)
wl_remove(link->priv); wl_remove(link->priv);
pcmcia_disable_device(link); pcmcia_disable_device(link);
DBG_LEAVE(DbgInfo);
} /* wl_adapter_release */ } /* wl_adapter_release */
/*============================================================================*/ /*============================================================================*/
...@@ -254,13 +249,10 @@ int wl_adapter_insert(struct pcmcia_device *link) ...@@ -254,13 +249,10 @@ int wl_adapter_insert(struct pcmcia_device *link)
printk(KERN_INFO "%s: Wireless, io_addr %#03lx, irq %d, mac_address" printk(KERN_INFO "%s: Wireless, io_addr %#03lx, irq %d, mac_address"
" %pM\n", dev->name, dev->base_addr, dev->irq, dev->dev_addr); " %pM\n", dev->name, dev->base_addr, dev->irq, dev->dev_addr);
DBG_LEAVE(DbgInfo);
return 0; return 0;
failed: failed:
wl_adapter_release(link); wl_adapter_release(link);
DBG_LEAVE(DbgInfo);
return ret; return ret;
} /* wl_adapter_insert */ } /* wl_adapter_insert */
/*============================================================================*/ /*============================================================================*/
...@@ -295,10 +287,8 @@ int wl_adapter_open(struct net_device *dev) ...@@ -295,10 +287,8 @@ int wl_adapter_open(struct net_device *dev)
DBG_PRINT("%s\n", VERSION_INFO); DBG_PRINT("%s\n", VERSION_INFO);
DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev); DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev);
if (!pcmcia_dev_present(link)) { if (!pcmcia_dev_present(link))
DBG_LEAVE(DbgInfo);
return -ENODEV; return -ENODEV;
}
link->open++; link->open++;
...@@ -309,7 +299,6 @@ int wl_adapter_open(struct net_device *dev) ...@@ -309,7 +299,6 @@ int wl_adapter_open(struct net_device *dev)
result = -ENODEV; result = -ENODEV;
} }
DBG_LEAVE(DbgInfo);
return result; return result;
} /* wl_adapter_open */ } /* wl_adapter_open */
/*============================================================================*/ /*============================================================================*/
...@@ -341,17 +330,14 @@ int wl_adapter_close(struct net_device *dev) ...@@ -341,17 +330,14 @@ int wl_adapter_close(struct net_device *dev)
DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev); DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev);
if (link == NULL) { if (link == NULL)
DBG_LEAVE(DbgInfo);
return -ENODEV; return -ENODEV;
}
DBG_TRACE(DbgInfo, "%s: Shutting down adapter.\n", dev->name); DBG_TRACE(DbgInfo, "%s: Shutting down adapter.\n", dev->name);
wl_close(dev); wl_close(dev);
link->open--; link->open--;
DBG_LEAVE(DbgInfo);
return 0; return 0;
} /* wl_adapter_close */ } /* wl_adapter_close */
/*============================================================================*/ /*============================================================================*/
...@@ -408,7 +394,6 @@ int wl_adapter_init_module(void) ...@@ -408,7 +394,6 @@ int wl_adapter_init_module(void)
ret = pcmcia_register_driver(&wlags49_driver); ret = pcmcia_register_driver(&wlags49_driver);
DBG_LEAVE(DbgInfo);
return ret; return ret;
} /* wl_adapter_init_module */ } /* wl_adapter_init_module */
/*============================================================================*/ /*============================================================================*/
...@@ -435,10 +420,8 @@ void wl_adapter_cleanup_module(void) ...@@ -435,10 +420,8 @@ void wl_adapter_cleanup_module(void)
{ {
DBG_TRACE(DbgInfo, "wl_adapter_cleanup_module() -- PCMCIA\n"); DBG_TRACE(DbgInfo, "wl_adapter_cleanup_module() -- PCMCIA\n");
pcmcia_unregister_driver(&wlags49_driver); pcmcia_unregister_driver(&wlags49_driver);
DBG_LEAVE(DbgInfo);
return; return;
} /* wl_adapter_cleanup_module */ } /* wl_adapter_cleanup_module */
/*============================================================================*/ /*============================================================================*/
......
...@@ -923,7 +923,6 @@ int wl_insert( struct net_device *dev ) ...@@ -923,7 +923,6 @@ int wl_insert( struct net_device *dev )
proc_mkdir("driver/wlags49", 0); proc_mkdir("driver/wlags49", 0);
#endif /* SCULL_USE_PROC */ #endif /* SCULL_USE_PROC */
DBG_LEAVE( DbgInfo );
return result; return result;
hcf_failed: hcf_failed:
...@@ -941,8 +940,6 @@ int wl_insert( struct net_device *dev ) ...@@ -941,8 +940,6 @@ int wl_insert( struct net_device *dev )
result = -EFAULT; result = -EFAULT;
DBG_LEAVE( DbgInfo );
return result; return result;
} // wl_insert } // wl_insert
/*============================================================================*/ /*============================================================================*/
...@@ -1016,7 +1013,6 @@ int wl_reset(struct net_device *dev) ...@@ -1016,7 +1013,6 @@ int wl_reset(struct net_device *dev)
} }
out: out:
DBG_LEAVE( DbgInfo );
return hcf_status; return hcf_status;
} // wl_reset } // wl_reset
/*============================================================================*/ /*============================================================================*/
...@@ -1140,7 +1136,6 @@ int rc; ...@@ -1140,7 +1136,6 @@ int rc;
} }
if ( hcf_status != HCF_SUCCESS ) { if ( hcf_status != HCF_SUCCESS ) {
DBG_ERROR( DbgInfo, "Firmware Download failed\n" ); DBG_ERROR( DbgInfo, "Firmware Download failed\n" );
DBG_LEAVE( DbgInfo );
return hcf_status; return hcf_status;
} }
} }
...@@ -1179,7 +1174,6 @@ int rc; ...@@ -1179,7 +1174,6 @@ int rc;
hcf_status = hcf_get_info( &lp->hcfCtx, (LTVP)&( lp->ltvRecord )); hcf_status = hcf_get_info( &lp->hcfCtx, (LTVP)&( lp->ltvRecord ));
if ( hcf_status != HCF_SUCCESS ) { if ( hcf_status != HCF_SUCCESS ) {
DBG_ERROR( DbgInfo, "Could not retrieve MAC address\n" ); DBG_ERROR( DbgInfo, "Could not retrieve MAC address\n" );
DBG_LEAVE( DbgInfo );
return hcf_status; return hcf_status;
} }
memcpy( lp->MACAddress, &lp->ltvRecord.u.u8[0], ETH_ALEN ); memcpy( lp->MACAddress, &lp->ltvRecord.u.u8[0], ETH_ALEN );
...@@ -1198,7 +1192,6 @@ int rc; ...@@ -1198,7 +1192,6 @@ int rc;
#endif // USE_WDS #endif // USE_WDS
hcf_status = wl_connect( lp ); hcf_status = wl_connect( lp );
} }
DBG_LEAVE( DbgInfo );
return hcf_status; return hcf_status;
} // wl_go } // wl_go
/*============================================================================*/ /*============================================================================*/
...@@ -1264,8 +1257,6 @@ void wl_set_wep_keys( struct wl_private *lp ) ...@@ -1264,8 +1257,6 @@ void wl_set_wep_keys( struct wl_private *lp )
DBG_NOTICE( DbgInfo, "encrypt: %d, ID: %d\n", lp->EnableEncryption, lp->TransmitKeyID ); DBG_NOTICE( DbgInfo, "encrypt: %d, ID: %d\n", lp->EnableEncryption, lp->TransmitKeyID );
DBG_NOTICE( DbgInfo, "set key: %s(%d) [%d]\n", lp->DefaultKeys.key[lp->TransmitKeyID-1].key, lp->DefaultKeys.key[lp->TransmitKeyID-1].len, lp->TransmitKeyID-1 ); DBG_NOTICE( DbgInfo, "set key: %s(%d) [%d]\n", lp->DefaultKeys.key[lp->TransmitKeyID-1].key, lp->DefaultKeys.key[lp->TransmitKeyID-1].len, lp->TransmitKeyID-1 );
} }
DBG_LEAVE( DbgInfo );
} // wl_set_wep_keys } // wl_set_wep_keys
/*============================================================================*/ /*============================================================================*/
...@@ -1307,13 +1298,11 @@ int wl_apply(struct wl_private *lp) ...@@ -1307,13 +1298,11 @@ int wl_apply(struct wl_private *lp)
hcf_status = wl_disconnect( lp ); hcf_status = wl_disconnect( lp );
if ( hcf_status != HCF_SUCCESS ) { if ( hcf_status != HCF_SUCCESS ) {
DBG_ERROR( DbgInfo, "Disconnect failed\n" ); DBG_ERROR( DbgInfo, "Disconnect failed\n" );
DBG_LEAVE( DbgInfo );
return -1; return -1;
} }
hcf_status = wl_disable( lp ); hcf_status = wl_disable( lp );
if ( hcf_status != HCF_SUCCESS ) { if ( hcf_status != HCF_SUCCESS ) {
DBG_ERROR( DbgInfo, "Disable failed\n" ); DBG_ERROR( DbgInfo, "Disable failed\n" );
DBG_LEAVE( DbgInfo );
return -1; return -1;
} else { } else {
/* Write out configuration to the device, enable, and reconnect. /* Write out configuration to the device, enable, and reconnect.
...@@ -1335,7 +1324,6 @@ int wl_apply(struct wl_private *lp) ...@@ -1335,7 +1324,6 @@ int wl_apply(struct wl_private *lp)
} }
} }
DBG_LEAVE( DbgInfo );
return hcf_status; return hcf_status;
} // wl_apply } // wl_apply
/*============================================================================*/ /*============================================================================*/
...@@ -1366,7 +1354,6 @@ int wl_put_ltv_init( struct wl_private *lp ) ...@@ -1366,7 +1354,6 @@ int wl_put_ltv_init( struct wl_private *lp )
if ( lp == NULL ) { if ( lp == NULL ) {
DBG_ERROR( DbgInfo, "lp pointer is NULL\n" ); DBG_ERROR( DbgInfo, "lp pointer is NULL\n" );
DBG_LEAVE( DbgInfo );
return -1; return -1;
} }
/* DMA/IO */ /* DMA/IO */
...@@ -1432,7 +1419,6 @@ int wl_put_ltv_init( struct wl_private *lp ) ...@@ -1432,7 +1419,6 @@ int wl_put_ltv_init( struct wl_private *lp )
DBG_TRACE( DbgInfo, "CFG_REG_INFO_LOG\n" ); DBG_TRACE( DbgInfo, "CFG_REG_INFO_LOG\n" );
DBG_TRACE( DbgInfo, "CFG_REG_INFO_LOG result : 0x%04x\n", DBG_TRACE( DbgInfo, "CFG_REG_INFO_LOG result : 0x%04x\n",
hcf_status ); hcf_status );
DBG_LEAVE( DbgInfo );
return hcf_status; return hcf_status;
} // wl_put_ltv_init } // wl_put_ltv_init
/*============================================================================*/ /*============================================================================*/
...@@ -1996,7 +1982,6 @@ int wl_put_ltv( struct wl_private *lp ) ...@@ -1996,7 +1982,6 @@ int wl_put_ltv( struct wl_private *lp )
/* Country Code */ /* Country Code */
/* countryInfo, ltvCountryInfo, CFG_CNF_COUNTRY_INFO */ /* countryInfo, ltvCountryInfo, CFG_CNF_COUNTRY_INFO */
DBG_LEAVE( DbgInfo );
return hcf_status; return hcf_status;
} // wl_put_ltv } // wl_put_ltv
/*============================================================================*/ /*============================================================================*/
...@@ -2061,7 +2046,6 @@ static int __init wl_module_init( void ) ...@@ -2061,7 +2046,6 @@ static int __init wl_module_init( void )
// #endif /* (HCF_TYPE) & HCF_TYPE_AP */ // #endif /* (HCF_TYPE) & HCF_TYPE_AP */
result = wl_adapter_init_module( ); result = wl_adapter_init_module( );
DBG_LEAVE( DbgInfo );
return result; return result;
} // init_module } // init_module
/*============================================================================*/ /*============================================================================*/
...@@ -2090,9 +2074,6 @@ static void __exit wl_module_exit( void ) ...@@ -2090,9 +2074,6 @@ static void __exit wl_module_exit( void )
#if 0 //SCULL_USE_PROC /* don't waste space if unused */ #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 remove_proc_entry( "wlags", NULL ); //;?why so a-symmetric compared to location of proc_create_data
#endif #endif
DBG_LEAVE( DbgInfo );
return;
} // cleanup_module } // cleanup_module
/*============================================================================*/ /*============================================================================*/
...@@ -2331,8 +2312,6 @@ void wl_remove( struct net_device *dev ) ...@@ -2331,8 +2312,6 @@ void wl_remove( struct net_device *dev )
#ifdef USE_RTS #ifdef USE_RTS
if ( lp->useRTS == 1 ) { if ( lp->useRTS == 1 ) {
wl_unlock( lp, &flags ); wl_unlock( lp, &flags );
DBG_LEAVE( DbgInfo );
return; return;
} }
#endif /* USE_RTS */ #endif /* USE_RTS */
...@@ -2341,9 +2320,6 @@ void wl_remove( struct net_device *dev ) ...@@ -2341,9 +2320,6 @@ void wl_remove( struct net_device *dev )
hcf_connect( &lp->hcfCtx, HCF_DISCONNECT ); hcf_connect( &lp->hcfCtx, HCF_DISCONNECT );
wl_unlock( lp, &flags ); wl_unlock( lp, &flags );
DBG_LEAVE( DbgInfo );
return;
} // wl_remove } // wl_remove
/*============================================================================*/ /*============================================================================*/
...@@ -2394,9 +2370,6 @@ void wl_suspend( struct net_device *dev ) ...@@ -2394,9 +2370,6 @@ void wl_suspend( struct net_device *dev )
lp->portState = WVLAN_PORT_STATE_DISABLED; lp->portState = WVLAN_PORT_STATE_DISABLED;
wl_unlock( lp, &flags ); wl_unlock( lp, &flags );
DBG_LEAVE( DbgInfo );
return;
} // wl_suspend } // wl_suspend
/*============================================================================*/ /*============================================================================*/
...@@ -2443,9 +2416,6 @@ void wl_resume(struct net_device *dev) ...@@ -2443,9 +2416,6 @@ void wl_resume(struct net_device *dev)
wl_act_int_on( lp ); wl_act_int_on( lp );
wl_unlock( lp, &flags ); wl_unlock( lp, &flags );
DBG_LEAVE( DbgInfo );
return;
} // wl_resume } // wl_resume
/*============================================================================*/ /*============================================================================*/
...@@ -2483,9 +2453,6 @@ void wl_release( struct net_device *dev ) ...@@ -2483,9 +2453,6 @@ void wl_release( struct net_device *dev )
lp->is_registered = FALSE; lp->is_registered = FALSE;
} }
DBG_LEAVE( DbgInfo );
return;
} // wl_release } // wl_release
/*============================================================================*/ /*============================================================================*/
...@@ -2580,7 +2547,6 @@ int wl_enable( struct wl_private *lp ) ...@@ -2580,7 +2547,6 @@ int wl_enable( struct wl_private *lp )
if ( hcf_status != HCF_SUCCESS ) { //;?make this an assert if ( hcf_status != HCF_SUCCESS ) { //;?make this an assert
DBG_TRACE( DbgInfo, "failed: 0x%x\n", hcf_status ); DBG_TRACE( DbgInfo, "failed: 0x%x\n", hcf_status );
} }
DBG_LEAVE( DbgInfo );
return hcf_status; return hcf_status;
} // wl_enable } // wl_enable
/*============================================================================*/ /*============================================================================*/
...@@ -2609,8 +2575,6 @@ void wl_enable_wds_ports( struct wl_private * lp ) ...@@ -2609,8 +2575,6 @@ void wl_enable_wds_ports( struct wl_private * lp )
if ( CNV_INT_TO_LITTLE( lp->hcfCtx.IFB_FWIdentity.comp_id ) == COMP_ID_FW_AP ){ if ( CNV_INT_TO_LITTLE( lp->hcfCtx.IFB_FWIdentity.comp_id ) == COMP_ID_FW_AP ){
DBG_ERROR( DbgInfo, "!!!!;? someone misunderstood something !!!!!\n" ); DBG_ERROR( DbgInfo, "!!!!;? someone misunderstood something !!!!!\n" );
} }
DBG_LEAVE( DbgInfo );
return;
} // wl_enable_wds_ports } // wl_enable_wds_ports
#endif /* USE_WDS */ #endif /* USE_WDS */
/*============================================================================*/ /*============================================================================*/
...@@ -2639,14 +2603,12 @@ int wl_connect( struct wl_private *lp ) ...@@ -2639,14 +2603,12 @@ int wl_connect( struct wl_private *lp )
if ( lp->portState != WVLAN_PORT_STATE_ENABLED ) { if ( lp->portState != WVLAN_PORT_STATE_ENABLED ) {
DBG_TRACE( DbgInfo, "No action: Not in enabled state\n" ); DBG_TRACE( DbgInfo, "No action: Not in enabled state\n" );
DBG_LEAVE( DbgInfo );
return HCF_SUCCESS; return HCF_SUCCESS;
} }
hcf_status = hcf_cntl( &lp->hcfCtx, HCF_CNTL_CONNECT ); hcf_status = hcf_cntl( &lp->hcfCtx, HCF_CNTL_CONNECT );
if ( hcf_status == HCF_SUCCESS ) { if ( hcf_status == HCF_SUCCESS ) {
lp->portState = WVLAN_PORT_STATE_CONNECTED; lp->portState = WVLAN_PORT_STATE_CONNECTED;
} }
DBG_LEAVE( DbgInfo );
return hcf_status; return hcf_status;
} // wl_connect } // wl_connect
/*============================================================================*/ /*============================================================================*/
...@@ -2675,14 +2637,12 @@ int wl_disconnect( struct wl_private *lp ) ...@@ -2675,14 +2637,12 @@ int wl_disconnect( struct wl_private *lp )
if ( lp->portState != WVLAN_PORT_STATE_CONNECTED ) { if ( lp->portState != WVLAN_PORT_STATE_CONNECTED ) {
DBG_TRACE( DbgInfo, "No action: Not in connected state\n" ); DBG_TRACE( DbgInfo, "No action: Not in connected state\n" );
DBG_LEAVE( DbgInfo );
return HCF_SUCCESS; return HCF_SUCCESS;
} }
hcf_status = hcf_cntl( &lp->hcfCtx, HCF_CNTL_DISCONNECT ); hcf_status = hcf_cntl( &lp->hcfCtx, HCF_CNTL_DISCONNECT );
if ( hcf_status == HCF_SUCCESS ) { if ( hcf_status == HCF_SUCCESS ) {
lp->portState = WVLAN_PORT_STATE_ENABLED; lp->portState = WVLAN_PORT_STATE_ENABLED;
} }
DBG_LEAVE( DbgInfo );
return hcf_status; return hcf_status;
} // wl_disconnect } // wl_disconnect
/*============================================================================*/ /*============================================================================*/
...@@ -2728,7 +2688,6 @@ int wl_disable( struct wl_private *lp ) ...@@ -2728,7 +2688,6 @@ int wl_disable( struct wl_private *lp )
if ( hcf_status != HCF_SUCCESS ) { if ( hcf_status != HCF_SUCCESS ) {
DBG_TRACE( DbgInfo, "failed: 0x%x\n", hcf_status ); DBG_TRACE( DbgInfo, "failed: 0x%x\n", hcf_status );
} }
DBG_LEAVE( DbgInfo );
return hcf_status; return hcf_status;
} // wl_disable } // wl_disable
/*============================================================================*/ /*============================================================================*/
...@@ -2765,7 +2724,6 @@ void wl_disable_wds_ports( struct wl_private * lp ) ...@@ -2765,7 +2724,6 @@ void wl_disable_wds_ports( struct wl_private * lp )
// wl_disable( lp, HCF_PORT_5 ); // wl_disable( lp, HCF_PORT_5 );
// wl_disable( lp, HCF_PORT_6 ); // wl_disable( lp, HCF_PORT_6 );
// } // }
DBG_LEAVE( DbgInfo );
return; return;
} // wl_disable_wds_ports } // wl_disable_wds_ports
#endif // USE_WDS #endif // USE_WDS
...@@ -2805,19 +2763,15 @@ int wl_mbx( struct wl_private *lp ) ...@@ -2805,19 +2763,15 @@ int wl_mbx( struct wl_private *lp )
if ( hcf_status != HCF_SUCCESS ) { if ( hcf_status != HCF_SUCCESS ) {
DBG_ERROR( DbgInfo, "hcf_get_info returned 0x%x\n", hcf_status ); DBG_ERROR( DbgInfo, "hcf_get_info returned 0x%x\n", hcf_status );
DBG_LEAVE( DbgInfo );
return hcf_status; return hcf_status;
} }
if ( lp->ltvRecord.typ == CFG_MB_INFO ) { if ( lp->ltvRecord.typ == CFG_MB_INFO )
DBG_LEAVE( DbgInfo );
return hcf_status; return hcf_status;
}
/* Endian translate the mailbox data, then process the message */ /* Endian translate the mailbox data, then process the message */
wl_endian_translate_mailbox( &( lp->ltvRecord )); wl_endian_translate_mailbox( &( lp->ltvRecord ));
wl_process_mailbox( lp ); wl_process_mailbox( lp );
DBG_LEAVE( DbgInfo );
return hcf_status; return hcf_status;
} // wl_mbx } // wl_mbx
/*============================================================================*/ /*============================================================================*/
...@@ -2930,9 +2884,6 @@ void wl_endian_translate_mailbox( ltv_t *ltv ) ...@@ -2930,9 +2884,6 @@ void wl_endian_translate_mailbox( ltv_t *ltv )
default: default:
break; break;
} }
DBG_LEAVE( DbgInfo );
return;
} // wl_endian_translate_mailbox } // wl_endian_translate_mailbox
/*============================================================================*/ /*============================================================================*/
...@@ -3386,8 +3337,6 @@ void wl_process_mailbox( struct wl_private *lp ) ...@@ -3386,8 +3337,6 @@ void wl_process_mailbox( struct wl_private *lp )
DBG_TRACE( DbgInfo, "UNKNOWN MESSAGE: 0x%04x\n", ltv->typ ); DBG_TRACE( DbgInfo, "UNKNOWN MESSAGE: 0x%04x\n", ltv->typ );
break; break;
} }
DBG_LEAVE( DbgInfo );
return;
} // wl_process_mailbox } // wl_process_mailbox
/*============================================================================*/ /*============================================================================*/
#endif /* ifndef USE_MBOX_SYNC */ #endif /* ifndef USE_MBOX_SYNC */
...@@ -3432,8 +3381,6 @@ void wl_wds_netdev_register( struct wl_private *lp ) ...@@ -3432,8 +3381,6 @@ void wl_wds_netdev_register( struct wl_private *lp )
} }
} }
} }
DBG_LEAVE( DbgInfo );
return;
} // wl_wds_netdev_register } // wl_wds_netdev_register
/*============================================================================*/ /*============================================================================*/
...@@ -3469,8 +3416,6 @@ void wl_wds_netdev_deregister( struct wl_private *lp ) ...@@ -3469,8 +3416,6 @@ void wl_wds_netdev_deregister( struct wl_private *lp )
lp->wds_port[count].is_registered = FALSE; lp->wds_port[count].is_registered = FALSE;
} }
} }
DBG_LEAVE( DbgInfo );
return;
} // wl_wds_netdev_deregister } // wl_wds_netdev_deregister
/*============================================================================*/ /*============================================================================*/
#endif /* USE_WDS */ #endif /* USE_WDS */
...@@ -3730,7 +3675,6 @@ static int write_int(struct file *file, const char *buffer, unsigned long count, ...@@ -3730,7 +3675,6 @@ static int write_int(struct file *file, const char *buffer, unsigned long count,
} }
} }
DBG_PRINT( "value: %08X\n", nr ); DBG_PRINT( "value: %08X\n", nr );
DBG_LEAVE( DbgInfo );
return count; return count;
} // write_int } // write_int
...@@ -3783,8 +3727,6 @@ void timer_oor( u_long arg ) ...@@ -3783,8 +3727,6 @@ void timer_oor( u_long arg )
lp->timer_oor.data = (unsigned long)lp; lp->timer_oor.data = (unsigned long)lp;
lp->timer_oor.expires = RUN_AT( (lp->timer_oor_cnt & ~DS_OOR) * HZ ); lp->timer_oor.expires = RUN_AT( (lp->timer_oor_cnt & ~DS_OOR) * HZ );
add_timer( &lp->timer_oor ); add_timer( &lp->timer_oor );
DBG_LEAVE( DbgInfo );
} // timer_oor } // timer_oor
#endif //DN554 #endif //DN554
......
...@@ -178,7 +178,6 @@ int wl_init( struct net_device *dev ) ...@@ -178,7 +178,6 @@ int wl_init( struct net_device *dev )
// wl_lock( lp, &flags ); // wl_lock( lp, &flags );
// wl_unlock( lp, &flags ); // wl_unlock( lp, &flags );
DBG_LEAVE( DbgInfo );
return 0; return 0;
} // wl_init } // wl_init
/*============================================================================*/ /*============================================================================*/
...@@ -211,7 +210,6 @@ int wl_config( struct net_device *dev, struct ifmap *map ) ...@@ -211,7 +210,6 @@ int wl_config( struct net_device *dev, struct ifmap *map )
ignore the request. */ ignore the request. */
DBG_TRACE(DbgInfo, "%s: %s called.\n", dev->name, __func__); DBG_TRACE(DbgInfo, "%s: %s called.\n", dev->name, __func__);
DBG_LEAVE( DbgInfo );
return 0; return 0;
} // wl_config } // wl_config
/*============================================================================*/ /*============================================================================*/
...@@ -252,8 +250,6 @@ struct net_device_stats *wl_stats( struct net_device *dev ) ...@@ -252,8 +250,6 @@ struct net_device_stats *wl_stats( struct net_device *dev )
#ifdef USE_RTS #ifdef USE_RTS
if( lp->useRTS == 1 ) { if( lp->useRTS == 1 ) {
wl_unlock( lp, &flags ); wl_unlock( lp, &flags );
//DBG_LEAVE( DbgInfo );
return NULL; return NULL;
} }
#endif /* USE_RTS */ #endif /* USE_RTS */
...@@ -276,8 +272,6 @@ struct net_device_stats *wl_stats( struct net_device *dev ) ...@@ -276,8 +272,6 @@ struct net_device_stats *wl_stats( struct net_device *dev )
wl_unlock( lp, &flags ); wl_unlock( lp, &flags );
//DBG_LEAVE( DbgInfo );
return pStats; return pStats;
} // wl_stats } // wl_stats
/*============================================================================*/ /*============================================================================*/
...@@ -312,7 +306,6 @@ int wl_open(struct net_device *dev) ...@@ -312,7 +306,6 @@ int wl_open(struct net_device *dev)
if( lp->useRTS == 1 ) { if( lp->useRTS == 1 ) {
DBG_TRACE( DbgInfo, "Skipping device open, in RTS mode\n" ); DBG_TRACE( DbgInfo, "Skipping device open, in RTS mode\n" );
wl_unlock( lp, &flags ); wl_unlock( lp, &flags );
DBG_LEAVE( DbgInfo );
return -EIO; return -EIO;
} }
#endif /* USE_RTS */ #endif /* USE_RTS */
...@@ -370,7 +363,6 @@ int wl_open(struct net_device *dev) ...@@ -370,7 +363,6 @@ int wl_open(struct net_device *dev)
wl_unlock( lp, &flags ); wl_unlock( lp, &flags );
DBG_LEAVE( DbgInfo );
return status; return status;
} // wl_open } // wl_open
/*============================================================================*/ /*============================================================================*/
...@@ -423,7 +415,6 @@ int wl_close( struct net_device *dev ) ...@@ -423,7 +415,6 @@ int wl_close( struct net_device *dev )
if( lp->useRTS == 1 ) { if( lp->useRTS == 1 ) {
DBG_TRACE( DbgInfo, "Skipping device close, in RTS mode\n" ); DBG_TRACE( DbgInfo, "Skipping device close, in RTS mode\n" );
wl_unlock( lp, &flags ); wl_unlock( lp, &flags );
DBG_LEAVE( DbgInfo );
return -EIO; return -EIO;
} }
#endif /* USE_RTS */ #endif /* USE_RTS */
...@@ -433,7 +424,6 @@ int wl_close( struct net_device *dev ) ...@@ -433,7 +424,6 @@ int wl_close( struct net_device *dev )
wl_unlock( lp, &flags ); wl_unlock( lp, &flags );
DBG_LEAVE( DbgInfo );
return 0; return 0;
} // wl_close } // wl_close
/*============================================================================*/ /*============================================================================*/
...@@ -543,7 +533,6 @@ int wl_ioctl( struct net_device *dev, struct ifreq *rq, int cmd ) ...@@ -543,7 +533,6 @@ int wl_ioctl( struct net_device *dev, struct ifreq *rq, int cmd )
wl_unlock( lp, &flags ); wl_unlock( lp, &flags );
DBG_LEAVE( DbgInfo );
return ret; return ret;
} // wl_ioctl } // wl_ioctl
/*============================================================================*/ /*============================================================================*/
...@@ -595,8 +584,6 @@ void wl_tx_timeout( struct net_device *dev ) ...@@ -595,8 +584,6 @@ void wl_tx_timeout( struct net_device *dev )
if( lp->useRTS == 1 ) { if( lp->useRTS == 1 ) {
DBG_TRACE( DbgInfo, "Skipping tx_timeout handler, in RTS mode\n" ); DBG_TRACE( DbgInfo, "Skipping tx_timeout handler, in RTS mode\n" );
wl_unlock( lp, &flags ); wl_unlock( lp, &flags );
DBG_LEAVE( DbgInfo );
return; return;
} }
#endif /* USE_RTS */ #endif /* USE_RTS */
...@@ -626,8 +613,6 @@ void wl_tx_timeout( struct net_device *dev ) ...@@ -626,8 +613,6 @@ void wl_tx_timeout( struct net_device *dev )
pStats->tx_errors++; pStats->tx_errors++;
wl_unlock( lp, &flags ); wl_unlock( lp, &flags );
DBG_LEAVE( DbgInfo );
} // wl_tx_timeout } // wl_tx_timeout
/*============================================================================*/ /*============================================================================*/
...@@ -1021,10 +1006,8 @@ void wl_multicast( struct net_device *dev ) ...@@ -1021,10 +1006,8 @@ void wl_multicast( struct net_device *dev )
DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev ); DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev );
if( !wl_adapter_is_open( dev )) { if( !wl_adapter_is_open( dev ))
DBG_LEAVE( DbgInfo );
return; return;
}
#if DBG #if DBG
if( DBG_FLAGS( DbgInfo ) & DBG_PARAM_ON ) { if( DBG_FLAGS( DbgInfo ) & DBG_PARAM_ON ) {
...@@ -1045,8 +1028,6 @@ void wl_multicast( struct net_device *dev ) ...@@ -1045,8 +1028,6 @@ void wl_multicast( struct net_device *dev )
#ifdef USE_RTS #ifdef USE_RTS
if( lp->useRTS == 1 ) { if( lp->useRTS == 1 ) {
DBG_TRACE( DbgInfo, "Skipping multicast, in RTS mode\n" ); DBG_TRACE( DbgInfo, "Skipping multicast, in RTS mode\n" );
DBG_LEAVE( DbgInfo );
return; return;
} }
#endif /* USE_RTS */ #endif /* USE_RTS */
...@@ -1114,7 +1095,6 @@ void wl_multicast( struct net_device *dev ) ...@@ -1114,7 +1095,6 @@ void wl_multicast( struct net_device *dev )
wl_act_int_on( lp ); wl_act_int_on( lp );
wl_unlock( lp, &flags ); wl_unlock( lp, &flags );
} }
DBG_LEAVE( DbgInfo );
#endif /* HCF_STA */ #endif /* HCF_STA */
} // wl_multicast } // wl_multicast
/*============================================================================*/ /*============================================================================*/
...@@ -1128,8 +1108,6 @@ void wl_multicast( struct net_device *dev, int num_addrs, void *addrs ) ...@@ -1128,8 +1108,6 @@ void wl_multicast( struct net_device *dev, int num_addrs, void *addrs )
DBG_PARAM( DbgInfo, "addrs", "0x%p", addrs ); DBG_PARAM( DbgInfo, "addrs", "0x%p", addrs );
#error Obsolete set multicast interface! #error Obsolete set multicast interface!
DBG_LEAVE( DbgInfo );
} // wl_multicast } // wl_multicast
/*============================================================================*/ /*============================================================================*/
...@@ -1214,7 +1192,6 @@ struct net_device * wl_device_alloc( void ) ...@@ -1214,7 +1192,6 @@ struct net_device * wl_device_alloc( void )
/* Allocate virtual devices for WDS support if needed */ /* Allocate virtual devices for WDS support if needed */
WL_WDS_DEVICE_ALLOC( lp ); WL_WDS_DEVICE_ALLOC( lp );
DBG_LEAVE( DbgInfo );
return dev; return dev;
} // wl_device_alloc } // wl_device_alloc
/*============================================================================*/ /*============================================================================*/
...@@ -1245,8 +1222,6 @@ void wl_device_dealloc( struct net_device *dev ) ...@@ -1245,8 +1222,6 @@ void wl_device_dealloc( struct net_device *dev )
WL_WDS_DEVICE_DEALLOC( lp ); WL_WDS_DEVICE_DEALLOC( lp );
free_netdev( dev ); free_netdev( dev );
DBG_LEAVE( DbgInfo );
} // wl_device_dealloc } // wl_device_dealloc
/*============================================================================*/ /*============================================================================*/
...@@ -1461,10 +1436,8 @@ void wl_wds_device_alloc( struct wl_private *lp ) ...@@ -1461,10 +1436,8 @@ void wl_wds_device_alloc( struct wl_private *lp )
struct net_device *dev_wds = NULL; struct net_device *dev_wds = NULL;
dev_wds = kzalloc(sizeof(struct net_device), GFP_KERNEL); dev_wds = kzalloc(sizeof(struct net_device), GFP_KERNEL);
if (!dev_wds) { if (!dev_wds)
DBG_LEAVE(DbgInfo);
return; return;
}
ether_setup( dev_wds ); ether_setup( dev_wds );
...@@ -1495,8 +1468,6 @@ void wl_wds_device_alloc( struct wl_private *lp ) ...@@ -1495,8 +1468,6 @@ void wl_wds_device_alloc( struct wl_private *lp )
lp->wds_port[5].dev->hard_start_xmit = &wl_tx_port6; lp->wds_port[5].dev->hard_start_xmit = &wl_tx_port6;
WL_WDS_NETIF_STOP_QUEUE( lp ); WL_WDS_NETIF_STOP_QUEUE( lp );
DBG_LEAVE( DbgInfo );
} // wl_wds_device_alloc } // wl_wds_device_alloc
/*============================================================================*/ /*============================================================================*/
...@@ -1536,8 +1507,6 @@ void wl_wds_device_dealloc( struct wl_private *lp ) ...@@ -1536,8 +1507,6 @@ void wl_wds_device_dealloc( struct wl_private *lp )
lp->wds_port[count].dev = NULL; lp->wds_port[count].dev = NULL;
} }
} }
DBG_LEAVE( DbgInfo );
} // wl_wds_device_dealloc } // wl_wds_device_dealloc
/*============================================================================*/ /*============================================================================*/
......
...@@ -194,7 +194,6 @@ int wl_adapter_init_module( void ) ...@@ -194,7 +194,6 @@ int wl_adapter_init_module( void )
result = pci_register_driver( &wl_driver ); //;?replace with pci_module_init, Rubini pg 490 result = pci_register_driver( &wl_driver ); //;?replace with pci_module_init, Rubini pg 490
//;? why not do something with the result //;? why not do something with the result
DBG_LEAVE( DbgInfo );
return 0; return 0;
} // wl_adapter_init_module } // wl_adapter_init_module
/*============================================================================*/ /*============================================================================*/
...@@ -223,7 +222,6 @@ void wl_adapter_cleanup_module( void ) ...@@ -223,7 +222,6 @@ void wl_adapter_cleanup_module( void )
pci_unregister_driver( &wl_driver ); pci_unregister_driver( &wl_driver );
DBG_LEAVE( DbgInfo );
return; return;
} // wl_adapter_cleanup_module } // wl_adapter_cleanup_module
/*============================================================================*/ /*============================================================================*/
...@@ -260,7 +258,6 @@ int wl_adapter_insert( struct net_device *dev ) ...@@ -260,7 +258,6 @@ int wl_adapter_insert( struct net_device *dev )
} else { } else {
DBG_TRACE( DbgInfo, "wl_insert() FAILED\n" ); DBG_TRACE( DbgInfo, "wl_insert() FAILED\n" );
} }
DBG_LEAVE( DbgInfo );
return result; return result;
} // wl_adapter_insert } // wl_adapter_insert
/*============================================================================*/ /*============================================================================*/
...@@ -295,7 +292,6 @@ int wl_adapter_open( struct net_device *dev ) ...@@ -295,7 +292,6 @@ int wl_adapter_open( struct net_device *dev )
result = -ENODEV; result = -ENODEV;
} }
DBG_LEAVE( DbgInfo );
return result; return result;
} // wl_adapter_open } // wl_adapter_open
/*============================================================================*/ /*============================================================================*/
...@@ -324,7 +320,6 @@ int wl_adapter_close( struct net_device *dev ) ...@@ -324,7 +320,6 @@ int wl_adapter_close( struct net_device *dev )
wl_close( dev ); wl_close( dev );
DBG_LEAVE( DbgInfo );
return 0; return 0;
} // wl_adapter_close } // wl_adapter_close
/*============================================================================*/ /*============================================================================*/
...@@ -388,8 +383,6 @@ int wl_pci_probe( struct pci_dev *pdev, ...@@ -388,8 +383,6 @@ int wl_pci_probe( struct pci_dev *pdev,
result = wl_pci_setup( pdev ); result = wl_pci_setup( pdev );
DBG_LEAVE( DbgInfo );
return result; return result;
} // wl_pci_probe } // wl_pci_probe
/*============================================================================*/ /*============================================================================*/
...@@ -439,7 +432,6 @@ void wl_pci_remove(struct pci_dev *pdev) ...@@ -439,7 +432,6 @@ void wl_pci_remove(struct pci_dev *pdev)
wl_device_dealloc( dev ); wl_device_dealloc( dev );
DBG_LEAVE( DbgInfo );
return; return;
} // wl_pci_remove } // wl_pci_remove
/*============================================================================*/ /*============================================================================*/
...@@ -477,7 +469,6 @@ int wl_pci_setup( struct pci_dev *pdev ) ...@@ -477,7 +469,6 @@ int wl_pci_setup( struct pci_dev *pdev )
result = pci_enable_device( pdev ); result = pci_enable_device( pdev );
if( result != 0 ) { if( result != 0 ) {
DBG_ERROR( DbgInfo, "pci_enable_device() failed\n" ); DBG_ERROR( DbgInfo, "pci_enable_device() failed\n" );
DBG_LEAVE( DbgInfo );
return result; return result;
} }
...@@ -486,7 +477,6 @@ int wl_pci_setup( struct pci_dev *pdev ) ...@@ -486,7 +477,6 @@ int wl_pci_setup( struct pci_dev *pdev )
dev = wl_device_alloc( ); dev = wl_device_alloc( );
if( dev == NULL ) { if( dev == NULL ) {
DBG_ERROR( DbgInfo, "Could not register device!!!\n" ); DBG_ERROR( DbgInfo, "Could not register device!!!\n" );
DBG_LEAVE( DbgInfo );
return -ENOMEM; return -ENOMEM;
} }
...@@ -494,7 +484,6 @@ int wl_pci_setup( struct pci_dev *pdev ) ...@@ -494,7 +484,6 @@ int wl_pci_setup( struct pci_dev *pdev )
if( dev->priv == NULL ) { if( dev->priv == NULL ) {
DBG_ERROR( DbgInfo, "Private adapter struct was not allocated!!!\n" ); DBG_ERROR( DbgInfo, "Private adapter struct was not allocated!!!\n" );
wl_device_dealloc(dev); wl_device_dealloc(dev);
DBG_LEAVE( DbgInfo );
return -ENOMEM; return -ENOMEM;
} }
...@@ -503,7 +492,6 @@ int wl_pci_setup( struct pci_dev *pdev ) ...@@ -503,7 +492,6 @@ int wl_pci_setup( struct pci_dev *pdev )
if( wl_pci_dma_alloc( pdev, dev->priv ) < 0 ) { if( wl_pci_dma_alloc( pdev, dev->priv ) < 0 ) {
DBG_ERROR( DbgInfo, "Could not allocate DMA descriptor memory!!!\n" ); DBG_ERROR( DbgInfo, "Could not allocate DMA descriptor memory!!!\n" );
wl_device_dealloc(dev); wl_device_dealloc(dev);
DBG_LEAVE( DbgInfo );
return -ENOMEM; return -ENOMEM;
} }
#endif #endif
...@@ -522,7 +510,6 @@ int wl_pci_setup( struct pci_dev *pdev ) ...@@ -522,7 +510,6 @@ int wl_pci_setup( struct pci_dev *pdev )
if( !wl_adapter_insert( dev )) { if( !wl_adapter_insert( dev )) {
DBG_ERROR( DbgInfo, "wl_adapter_insert() FAILED!!!\n" ); DBG_ERROR( DbgInfo, "wl_adapter_insert() FAILED!!!\n" );
wl_device_dealloc( dev ); wl_device_dealloc( dev );
DBG_LEAVE( DbgInfo );
return -EINVAL; return -EINVAL;
} }
...@@ -534,7 +521,6 @@ int wl_pci_setup( struct pci_dev *pdev ) ...@@ -534,7 +521,6 @@ int wl_pci_setup( struct pci_dev *pdev )
DBG_WARNING( DbgInfo, "Could not register ISR!!!\n" ); DBG_WARNING( DbgInfo, "Could not register ISR!!!\n" );
wl_remove(dev); wl_remove(dev);
wl_device_dealloc(dev); wl_device_dealloc(dev);
DBG_LEAVE( DbgInfo );
return result; return result;
} }
...@@ -550,7 +536,6 @@ int wl_pci_setup( struct pci_dev *pdev ) ...@@ -550,7 +536,6 @@ int wl_pci_setup( struct pci_dev *pdev )
/* Enable bus mastering */ /* Enable bus mastering */
pci_set_master( pdev ); pci_set_master( pdev );
DBG_LEAVE( DbgInfo );
return 0; return 0;
} // wl_pci_setup } // wl_pci_setup
/*============================================================================*/ /*============================================================================*/
...@@ -611,9 +596,6 @@ void wl_pci_enable_cardbus_interrupts( struct pci_dev *pdev ) ...@@ -611,9 +596,6 @@ void wl_pci_enable_cardbus_interrupts( struct pci_dev *pdev )
/* Once complete, unmap the region and exit */ /* Once complete, unmap the region and exit */
iounmap( mem_addr_kern ); iounmap( mem_addr_kern );
DBG_LEAVE( DbgInfo );
return;
} // wl_pci_enable_cardbus_interrupts } // wl_pci_enable_cardbus_interrupts
/*============================================================================*/ /*============================================================================*/
...@@ -680,7 +662,6 @@ int wl_pci_dma_alloc( struct pci_dev *pdev, struct wl_private *lp ) ...@@ -680,7 +662,6 @@ int wl_pci_dma_alloc( struct pci_dev *pdev, struct wl_private *lp )
// } // }
// /* Store status, as host should not call HCF functions if this fails */ // /* Store status, as host should not call HCF functions if this fails */
// lp->dma.status = status; //;?all useages of dma.status have been commented out // lp->dma.status = status; //;?all useages of dma.status have been commented out
// DBG_LEAVE( DbgInfo );
return status; return status;
} // wl_pci_dma_alloc } // wl_pci_dma_alloc
/*============================================================================*/ /*============================================================================*/
...@@ -753,7 +734,6 @@ int wl_pci_dma_free( struct pci_dev *pdev, struct wl_private *lp ) ...@@ -753,7 +734,6 @@ int wl_pci_dma_free( struct pci_dev *pdev, struct wl_private *lp )
} }
} }
DBG_LEAVE( DbgInfo );
return status; return status;
} // wl_pci_dma_free } // wl_pci_dma_free
...@@ -1085,7 +1065,6 @@ int wl_pci_dma_alloc_desc( struct pci_dev *pdev, struct wl_private *lp, ...@@ -1085,7 +1065,6 @@ int wl_pci_dma_alloc_desc( struct pci_dev *pdev, struct wl_private *lp,
// memset( *desc, 0, sizeof( DESC_STRCT )); // memset( *desc, 0, sizeof( DESC_STRCT ));
// (*desc)->desc_phys_addr = cpu_to_le32( pa ); // (*desc)->desc_phys_addr = cpu_to_le32( pa );
// } // }
// DBG_LEAVE( DbgInfo );
// return status; // return status;
} // wl_pci_dma_alloc_desc } // wl_pci_dma_alloc_desc
/*============================================================================*/ /*============================================================================*/
...@@ -1169,7 +1148,6 @@ int wl_pci_dma_alloc_buf( struct pci_dev *pdev, struct wl_private *lp, ...@@ -1169,7 +1148,6 @@ int wl_pci_dma_alloc_buf( struct pci_dev *pdev, struct wl_private *lp,
// desc->buf_phys_addr = cpu_to_le32( pa ); // desc->buf_phys_addr = cpu_to_le32( pa );
// SET_BUF_SIZE( desc, size ); // SET_BUF_SIZE( desc, size );
// } // }
// DBG_LEAVE( DbgInfo );
return status; return status;
} // wl_pci_dma_alloc_buf } // wl_pci_dma_alloc_buf
/*============================================================================*/ /*============================================================================*/
...@@ -1271,7 +1249,6 @@ void wl_pci_dma_hcf_supply( struct wl_private *lp ) ...@@ -1271,7 +1249,6 @@ void wl_pci_dma_hcf_supply( struct wl_private *lp )
} }
//} //}
DBG_LEAVE( DbgInfo );
return; return;
} // wl_pci_dma_hcf_supply } // wl_pci_dma_hcf_supply
/*============================================================================*/ /*============================================================================*/
...@@ -1322,7 +1299,6 @@ void wl_pci_dma_hcf_reclaim( struct wl_private *lp ) ...@@ -1322,7 +1299,6 @@ void wl_pci_dma_hcf_reclaim( struct wl_private *lp )
// } // }
} }
DBG_LEAVE( DbgInfo );
return; return;
} // wl_pci_dma_hcf_reclaim } // wl_pci_dma_hcf_reclaim
/*============================================================================*/ /*============================================================================*/
...@@ -1371,7 +1347,6 @@ void wl_pci_dma_hcf_reclaim_rx( struct wl_private *lp ) ...@@ -1371,7 +1347,6 @@ void wl_pci_dma_hcf_reclaim_rx( struct wl_private *lp )
DBG_PRINT( "rx_packet[%d] 0x%p\n", i, lp->dma.rx_packet[i] ); DBG_PRINT( "rx_packet[%d] 0x%p\n", i, lp->dma.rx_packet[i] );
} }
//} //}
DBG_LEAVE( DbgInfo );
} // wl_pci_dma_hcf_reclaim_rx } // wl_pci_dma_hcf_reclaim_rx
/*============================================================================*/ /*============================================================================*/
...@@ -1505,7 +1480,6 @@ void wl_pci_dma_hcf_reclaim_tx( struct wl_private *lp ) ...@@ -1505,7 +1480,6 @@ void wl_pci_dma_hcf_reclaim_tx( struct wl_private *lp )
WL_WDS_NETIF_WAKE_QUEUE( lp ); WL_WDS_NETIF_WAKE_QUEUE( lp );
lp->netif_queue_on = TRUE; lp->netif_queue_on = TRUE;
} }
DBG_LEAVE( DbgInfo );
return; return;
} // wl_pci_dma_hcf_reclaim_tx } // wl_pci_dma_hcf_reclaim_tx
/*============================================================================*/ /*============================================================================*/
......
...@@ -161,7 +161,6 @@ int wvlan_uil(struct uilreq *urq, struct wl_private *lp) ...@@ -161,7 +161,6 @@ int wvlan_uil(struct uilreq *urq, struct wl_private *lp)
ioctl_ret = -EOPNOTSUPP; ioctl_ret = -EOPNOTSUPP;
break; break;
} }
DBG_LEAVE(DbgInfo);
return ioctl_ret; return ioctl_ret;
} /* wvlan_uil */ } /* wvlan_uil */
/*============================================================================*/ /*============================================================================*/
...@@ -201,7 +200,6 @@ int wvlan_uil_connect(struct uilreq *urq, struct wl_private *lp) ...@@ -201,7 +200,6 @@ int wvlan_uil_connect(struct uilreq *urq, struct wl_private *lp)
urq->result = UIL_ERR_IN_USE; urq->result = UIL_ERR_IN_USE;
} }
DBG_LEAVE(DbgInfo);
return result; return result;
} /* wvlan_uil_connect */ } /* wvlan_uil_connect */
/*============================================================================*/ /*============================================================================*/
...@@ -250,7 +248,6 @@ int wvlan_uil_disconnect(struct uilreq *urq, struct wl_private *lp) ...@@ -250,7 +248,6 @@ int wvlan_uil_disconnect(struct uilreq *urq, struct wl_private *lp)
urq->result = UIL_ERR_WRONG_IFB; urq->result = UIL_ERR_WRONG_IFB;
} }
DBG_LEAVE(DbgInfo);
return result; return result;
} /* wvlan_uil_disconnect */ } /* wvlan_uil_disconnect */
/*============================================================================*/ /*============================================================================*/
...@@ -322,7 +319,6 @@ int wvlan_uil_action(struct uilreq *urq, struct wl_private *lp) ...@@ -322,7 +319,6 @@ int wvlan_uil_action(struct uilreq *urq, struct wl_private *lp)
urq->result = UIL_ERR_WRONG_IFB; urq->result = UIL_ERR_WRONG_IFB;
} }
DBG_LEAVE(DbgInfo);
return result; return result;
} /* wvlan_uil_action */ } /* wvlan_uil_action */
/*============================================================================*/ /*============================================================================*/
...@@ -371,7 +367,6 @@ int wvlan_uil_block(struct uilreq *urq, struct wl_private *lp) ...@@ -371,7 +367,6 @@ int wvlan_uil_block(struct uilreq *urq, struct wl_private *lp)
urq->result = UIL_ERR_WRONG_IFB; urq->result = UIL_ERR_WRONG_IFB;
} }
DBG_LEAVE(DbgInfo);
return result; return result;
} /* wvlan_uil_block */ } /* wvlan_uil_block */
/*============================================================================*/ /*============================================================================*/
...@@ -419,7 +414,6 @@ int wvlan_uil_unblock(struct uilreq *urq, struct wl_private *lp) ...@@ -419,7 +414,6 @@ int wvlan_uil_unblock(struct uilreq *urq, struct wl_private *lp)
urq->result = UIL_ERR_WRONG_IFB; urq->result = UIL_ERR_WRONG_IFB;
} }
DBG_LEAVE(DbgInfo);
return result; return result;
} /* wvlan_uil_unblock */ } /* wvlan_uil_unblock */
/*============================================================================*/ /*============================================================================*/
...@@ -462,7 +456,6 @@ int wvlan_uil_send_diag_msg(struct uilreq *urq, struct wl_private *lp) ...@@ -462,7 +456,6 @@ int wvlan_uil_send_diag_msg(struct uilreq *urq, struct wl_private *lp)
if (result != 0) { if (result != 0) {
DBG_ERROR(DbgInfo, "verify_area failed, result: %d\n", result); DBG_ERROR(DbgInfo, "verify_area failed, result: %d\n", result);
urq->result = UIL_FAILURE; urq->result = UIL_FAILURE;
DBG_LEAVE(DbgInfo);
return result; return result;
} }
...@@ -481,7 +474,6 @@ int wvlan_uil_send_diag_msg(struct uilreq *urq, struct wl_private *lp) ...@@ -481,7 +474,6 @@ int wvlan_uil_send_diag_msg(struct uilreq *urq, struct wl_private *lp)
DBG_ERROR(DbgInfo, "ENOMEM\n"); DBG_ERROR(DbgInfo, "ENOMEM\n");
urq->result = UIL_FAILURE; urq->result = UIL_FAILURE;
result = -ENOMEM; result = -ENOMEM;
DBG_LEAVE(DbgInfo);
return result; return result;
} }
...@@ -502,7 +494,6 @@ int wvlan_uil_send_diag_msg(struct uilreq *urq, struct wl_private *lp) ...@@ -502,7 +494,6 @@ int wvlan_uil_send_diag_msg(struct uilreq *urq, struct wl_private *lp)
urq->result = UIL_ERR_WRONG_IFB; urq->result = UIL_ERR_WRONG_IFB;
} }
DBG_LEAVE(DbgInfo);
return result; return result;
} /* wvlan_uil_send_diag_msg */ } /* wvlan_uil_send_diag_msg */
/*============================================================================*/ /*============================================================================*/
...@@ -548,7 +539,6 @@ int wvlan_uil_put_info(struct uilreq *urq, struct wl_private *lp) ...@@ -548,7 +539,6 @@ int wvlan_uil_put_info(struct uilreq *urq, struct wl_private *lp)
urq->result = UIL_ERR_LEN; urq->result = UIL_ERR_LEN;
DBG_ERROR(DbgInfo, "No Length/Type in LTV!!!\n"); DBG_ERROR(DbgInfo, "No Length/Type in LTV!!!\n");
DBG_ERROR(DbgInfo, "UIL_ERR_LEN\n"); DBG_ERROR(DbgInfo, "UIL_ERR_LEN\n");
DBG_LEAVE(DbgInfo);
return result; return result;
} }
...@@ -557,7 +547,6 @@ int wvlan_uil_put_info(struct uilreq *urq, struct wl_private *lp) ...@@ -557,7 +547,6 @@ int wvlan_uil_put_info(struct uilreq *urq, struct wl_private *lp)
if (result != 0) { if (result != 0) {
urq->result = UIL_FAILURE; urq->result = UIL_FAILURE;
DBG_ERROR(DbgInfo, "verify_area(), VERIFY_READ FAILED\n"); DBG_ERROR(DbgInfo, "verify_area(), VERIFY_READ FAILED\n");
DBG_LEAVE(DbgInfo);
return result; return result;
} }
...@@ -570,7 +559,6 @@ int wvlan_uil_put_info(struct uilreq *urq, struct wl_private *lp) ...@@ -570,7 +559,6 @@ int wvlan_uil_put_info(struct uilreq *urq, struct wl_private *lp)
urq->len = sizeof(lp->ltvRecord); urq->len = sizeof(lp->ltvRecord);
urq->result = UIL_ERR_LEN; urq->result = UIL_ERR_LEN;
DBG_ERROR(DbgInfo, "UIL_ERR_LEN\n"); DBG_ERROR(DbgInfo, "UIL_ERR_LEN\n");
DBG_LEAVE(DbgInfo);
return result; return result;
} }
...@@ -586,7 +574,6 @@ int wvlan_uil_put_info(struct uilreq *urq, struct wl_private *lp) ...@@ -586,7 +574,6 @@ int wvlan_uil_put_info(struct uilreq *urq, struct wl_private *lp)
urq->len = sizeof(lp->ltvRecord); urq->len = sizeof(lp->ltvRecord);
urq->result = UIL_ERR_LEN; urq->result = UIL_ERR_LEN;
result = -ENOMEM; result = -ENOMEM;
DBG_LEAVE(DbgInfo);
return result; return result;
} }
} else { } else {
...@@ -1120,7 +1107,6 @@ int wvlan_uil_put_info(struct uilreq *urq, struct wl_private *lp) ...@@ -1120,7 +1107,6 @@ int wvlan_uil_put_info(struct uilreq *urq, struct wl_private *lp)
urq->result = UIL_ERR_WRONG_IFB; urq->result = UIL_ERR_WRONG_IFB;
} }
DBG_LEAVE(DbgInfo);
return result; return result;
} /* wvlan_uil_put_info */ } /* wvlan_uil_put_info */
...@@ -1162,7 +1148,6 @@ int wvlan_uil_get_info(struct uilreq *urq, struct wl_private *lp) ...@@ -1162,7 +1148,6 @@ int wvlan_uil_get_info(struct uilreq *urq, struct wl_private *lp)
DBG_ERROR(DbgInfo, "No Length/Type in LTV!!!\n"); DBG_ERROR(DbgInfo, "No Length/Type in LTV!!!\n");
DBG_ERROR(DbgInfo, "UIL_ERR_LEN\n"); DBG_ERROR(DbgInfo, "UIL_ERR_LEN\n");
urq->result = UIL_ERR_LEN; urq->result = UIL_ERR_LEN;
DBG_LEAVE(DbgInfo);
return result; return result;
} }
...@@ -1171,7 +1156,6 @@ int wvlan_uil_get_info(struct uilreq *urq, struct wl_private *lp) ...@@ -1171,7 +1156,6 @@ int wvlan_uil_get_info(struct uilreq *urq, struct wl_private *lp)
if (result != 0) { if (result != 0) {
DBG_ERROR(DbgInfo, "verify_area(), VERIFY_READ FAILED\n"); DBG_ERROR(DbgInfo, "verify_area(), VERIFY_READ FAILED\n");
urq->result = UIL_FAILURE; urq->result = UIL_FAILURE;
DBG_LEAVE(DbgInfo);
return result; return result;
} }
...@@ -1184,7 +1168,6 @@ int wvlan_uil_get_info(struct uilreq *urq, struct wl_private *lp) ...@@ -1184,7 +1168,6 @@ int wvlan_uil_get_info(struct uilreq *urq, struct wl_private *lp)
DBG_ERROR(DbgInfo, "Incoming LTV too big\n"); DBG_ERROR(DbgInfo, "Incoming LTV too big\n");
urq->len = sizeof(lp->ltvRecord); urq->len = sizeof(lp->ltvRecord);
urq->result = UIL_ERR_LEN; urq->result = UIL_ERR_LEN;
DBG_LEAVE(DbgInfo);
return result; return result;
} }
...@@ -1468,7 +1451,6 @@ int wvlan_uil_get_info(struct uilreq *urq, struct wl_private *lp) ...@@ -1468,7 +1451,6 @@ int wvlan_uil_get_info(struct uilreq *urq, struct wl_private *lp)
urq->result = UIL_ERR_WRONG_IFB; urq->result = UIL_ERR_WRONG_IFB;
} }
DBG_LEAVE(DbgInfo);
return result; return result;
} /* wvlan_uil_get_info */ } /* wvlan_uil_get_info */
/*============================================================================*/ /*============================================================================*/
...@@ -1504,7 +1486,6 @@ int cfg_driver_info(struct uilreq *urq, struct wl_private *lp) ...@@ -1504,7 +1486,6 @@ int cfg_driver_info(struct uilreq *urq, struct wl_private *lp)
if (urq->len < sizeof(lp->driverInfo)) { if (urq->len < sizeof(lp->driverInfo)) {
urq->len = sizeof(lp->driverInfo); urq->len = sizeof(lp->driverInfo);
urq->result = UIL_ERR_LEN; urq->result = UIL_ERR_LEN;
DBG_LEAVE(DbgInfo);
return result; return result;
} }
...@@ -1512,7 +1493,6 @@ int cfg_driver_info(struct uilreq *urq, struct wl_private *lp) ...@@ -1512,7 +1493,6 @@ int cfg_driver_info(struct uilreq *urq, struct wl_private *lp)
result = verify_area(VERIFY_WRITE, urq->data, sizeof(lp->driverInfo)); result = verify_area(VERIFY_WRITE, urq->data, sizeof(lp->driverInfo));
if (result != 0) { if (result != 0) {
urq->result = UIL_FAILURE; urq->result = UIL_FAILURE;
DBG_LEAVE(DbgInfo);
return result; return result;
} }
...@@ -1522,7 +1502,6 @@ int cfg_driver_info(struct uilreq *urq, struct wl_private *lp) ...@@ -1522,7 +1502,6 @@ int cfg_driver_info(struct uilreq *urq, struct wl_private *lp)
urq->result = UIL_SUCCESS; urq->result = UIL_SUCCESS;
copy_to_user(urq->data, &(lp->driverInfo), sizeof(lp->driverInfo)); copy_to_user(urq->data, &(lp->driverInfo), sizeof(lp->driverInfo));
DBG_LEAVE(DbgInfo);
return result; return result;
} /* cfg_driver_info */ } /* cfg_driver_info */
/*============================================================================*/ /*============================================================================*/
...@@ -1557,7 +1536,6 @@ int cfg_driver_identity(struct uilreq *urq, struct wl_private *lp) ...@@ -1557,7 +1536,6 @@ int cfg_driver_identity(struct uilreq *urq, struct wl_private *lp)
if (urq->len < sizeof(lp->driverIdentity)) { if (urq->len < sizeof(lp->driverIdentity)) {
urq->len = sizeof(lp->driverIdentity); urq->len = sizeof(lp->driverIdentity);
urq->result = UIL_ERR_LEN; urq->result = UIL_ERR_LEN;
DBG_LEAVE(DbgInfo);
return result; return result;
} }
...@@ -1565,7 +1543,6 @@ int cfg_driver_identity(struct uilreq *urq, struct wl_private *lp) ...@@ -1565,7 +1543,6 @@ int cfg_driver_identity(struct uilreq *urq, struct wl_private *lp)
result = verify_area(VERIFY_WRITE, urq->data, sizeof(lp->driverIdentity)); result = verify_area(VERIFY_WRITE, urq->data, sizeof(lp->driverIdentity));
if (result != 0) { if (result != 0) {
urq->result = UIL_FAILURE; urq->result = UIL_FAILURE;
DBG_LEAVE(DbgInfo);
return result; return result;
} }
...@@ -1573,7 +1550,6 @@ int cfg_driver_identity(struct uilreq *urq, struct wl_private *lp) ...@@ -1573,7 +1550,6 @@ int cfg_driver_identity(struct uilreq *urq, struct wl_private *lp)
urq->result = UIL_SUCCESS; urq->result = UIL_SUCCESS;
copy_to_user(urq->data, &(lp->driverIdentity), sizeof(lp->driverIdentity)); copy_to_user(urq->data, &(lp->driverIdentity), sizeof(lp->driverIdentity));
DBG_LEAVE(DbgInfo);
return result; return result;
} /* cfg_driver_identity */ } /* cfg_driver_identity */
/*============================================================================*/ /*============================================================================*/
...@@ -1625,7 +1601,6 @@ int wvlan_set_netname(struct net_device *dev, ...@@ -1625,7 +1601,6 @@ int wvlan_set_netname(struct net_device *dev,
wl_apply(lp); wl_apply(lp);
wl_unlock(lp, &flags); wl_unlock(lp, &flags);
DBG_LEAVE(DbgInfo);
return ret; return ret;
} /* wvlan_set_netname */ } /* wvlan_set_netname */
/*============================================================================*/ /*============================================================================*/
...@@ -1684,7 +1659,6 @@ int wvlan_get_netname(struct net_device *dev, ...@@ -1684,7 +1659,6 @@ int wvlan_get_netname(struct net_device *dev,
wl_unlock(lp, &flags); wl_unlock(lp, &flags);
DBG_LEAVE(DbgInfo);
return ret; return ret;
} /* wvlan_get_netname */ } /* wvlan_get_netname */
/*============================================================================*/ /*============================================================================*/
...@@ -1731,7 +1705,6 @@ int wvlan_set_station_nickname(struct net_device *dev, ...@@ -1731,7 +1705,6 @@ int wvlan_set_station_nickname(struct net_device *dev,
wl_apply(lp); wl_apply(lp);
wl_unlock(lp, &flags); wl_unlock(lp, &flags);
DBG_LEAVE(DbgInfo);
return ret; return ret;
} /* wvlan_set_station_nickname */ } /* wvlan_set_station_nickname */
/*============================================================================*/ /*============================================================================*/
...@@ -1790,7 +1763,6 @@ int wvlan_get_station_nickname(struct net_device *dev, ...@@ -1790,7 +1763,6 @@ int wvlan_get_station_nickname(struct net_device *dev,
wl_unlock(lp, &flags); wl_unlock(lp, &flags);
/* out: */ /* out: */
DBG_LEAVE(DbgInfo);
return ret; return ret;
} /* wvlan_get_station_nickname */ } /* wvlan_get_station_nickname */
/*============================================================================*/ /*============================================================================*/
...@@ -1846,7 +1818,6 @@ int wvlan_set_porttype(struct net_device *dev, ...@@ -1846,7 +1818,6 @@ int wvlan_set_porttype(struct net_device *dev,
wl_unlock(lp, &flags); wl_unlock(lp, &flags);
/* out: */ /* out: */
DBG_LEAVE(DbgInfo);
return ret; return ret;
} }
...@@ -1903,7 +1874,6 @@ int wvlan_get_porttype(struct net_device *dev, ...@@ -1903,7 +1874,6 @@ int wvlan_get_porttype(struct net_device *dev,
wl_unlock(lp, &flags); wl_unlock(lp, &flags);
/* out: */ /* out: */
DBG_LEAVE(DbgInfo);
return ret; return ret;
} /* wvlan_get_porttype */ } /* wvlan_get_porttype */
/*============================================================================*/ /*============================================================================*/
...@@ -1967,7 +1937,6 @@ int wvlan_rts(struct rtsreq *rrq, __u32 io_base) ...@@ -1967,7 +1937,6 @@ int wvlan_rts(struct rtsreq *rrq, __u32 io_base)
break; break;
} }
DBG_LEAVE(DbgInfo);
return ioctl_ret; return ioctl_ret;
} /* wvlan_rts */ } /* wvlan_rts */
/*============================================================================*/ /*============================================================================*/
......
...@@ -268,7 +268,6 @@ void parse_config(struct net_device *dev) ...@@ -268,7 +268,6 @@ void parse_config(struct net_device *dev)
set_fs(fs); /* Return to the original context */ set_fs(fs); /* Return to the original context */
#endif /* BIN_DL */ #endif /* BIN_DL */
DBG_LEAVE(DbgInfo);
return; return;
} /* parse_config */ } /* parse_config */
...@@ -995,7 +994,6 @@ void ParseConfigLine(char *pszLine, char **ppszLVal, char **ppszRVal) ...@@ -995,7 +994,6 @@ void ParseConfigLine(char *pszLine, char **ppszLVal, char **ppszRVal)
pszLine[i] = '\0'; pszLine[i] = '\0';
} }
} }
DBG_LEAVE(DbgInfo);
} /* ParseConfigLine */ } /* ParseConfigLine */
/*============================================================================*/ /*============================================================================*/
......
...@@ -578,9 +578,6 @@ void wl_endian_translate_event( ltv_t *pLtv ) ...@@ -578,9 +578,6 @@ void wl_endian_translate_event( ltv_t *pLtv )
default: default:
break; break;
} }
DBG_LEAVE( DbgInfo );
return;
} // wl_endian_translate_event } // wl_endian_translate_event
/*============================================================================*/ /*============================================================================*/
...@@ -1019,8 +1016,6 @@ void wl_process_link_status( struct wl_private *lp ) ...@@ -1019,8 +1016,6 @@ void wl_process_link_status( struct wl_private *lp )
break; break;
} }
} }
DBG_LEAVE( DbgInfo );
return;
} // wl_process_link_status } // wl_process_link_status
/*============================================================================*/ /*============================================================================*/
...@@ -1221,9 +1216,6 @@ void wl_process_probe_response( struct wl_private *lp ) ...@@ -1221,9 +1216,6 @@ void wl_process_probe_response( struct wl_private *lp )
} }
} }
} }
DBG_LEAVE( DbgInfo );
return;
} // wl_process_probe_response } // wl_process_probe_response
/*============================================================================*/ /*============================================================================*/
...@@ -1268,9 +1260,6 @@ void wl_process_updated_record( struct wl_private *lp ) ...@@ -1268,9 +1260,6 @@ void wl_process_updated_record( struct wl_private *lp )
lp->updatedRecord.u.u16[0] ); lp->updatedRecord.u.u16[0] );
} }
} }
DBG_LEAVE( DbgInfo );
return;
} // wl_process_updated_record } // wl_process_updated_record
/*============================================================================*/ /*============================================================================*/
...@@ -1329,9 +1318,6 @@ void wl_process_assoc_status( struct wl_private *lp ) ...@@ -1329,9 +1318,6 @@ void wl_process_assoc_status( struct wl_private *lp )
assoc_stat->oldApAddr); assoc_stat->oldApAddr);
} }
} }
DBG_LEAVE( DbgInfo );
return;
} // wl_process_assoc_status } // wl_process_assoc_status
/*============================================================================*/ /*============================================================================*/
...@@ -1395,9 +1381,6 @@ void wl_process_security_status( struct wl_private *lp ) ...@@ -1395,9 +1381,6 @@ void wl_process_security_status( struct wl_private *lp )
DBG_TRACE(DbgInfo, "Reason : 0x%04x\n", sec_stat->reason); DBG_TRACE(DbgInfo, "Reason : 0x%04x\n", sec_stat->reason);
} }
DBG_LEAVE( DbgInfo );
return;
} // wl_process_security_status } // wl_process_security_status
/*============================================================================*/ /*============================================================================*/
...@@ -1423,8 +1406,6 @@ int wl_get_tallies(struct wl_private *lp, ...@@ -1423,8 +1406,6 @@ int wl_get_tallies(struct wl_private *lp,
ret = -EFAULT; ret = -EFAULT;
} }
DBG_LEAVE( DbgInfo );
return ret; return ret;
} }
This diff is collapsed.
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