evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: wlags49_h2: remove DBG_ENTER() macro

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

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2014-01-09 09:07:30 -08:00
parent 064d5a72d0
commit b35360bc8c
9 changed files with 8 additions and 369 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/staging/wlags49_h2/debug.h
View file

@ -129,17 +129,10 @@
#define _LEAVE_STR "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" #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) \ #define _DBG_LEAVE(A) \
DBG_PRINT("%s:%.*s:%s\n", DBG_NAME(A), DBG_LEVEL(A)--, \ DBG_PRINT("%s:%.*s:%s\n", DBG_NAME(A), DBG_LEVEL(A)--, \
_LEAVE_STR, __func__) _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) \ #define DBG_LEAVE(A) {if (DBG_FLAGS(A) & DBG_TRACE_ON) \
_DBG_LEAVE(A); } _DBG_LEAVE(A); }
@ -208,7 +201,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_ENTER(A)
#define DBG_LEAVE(A) #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...)

15
drivers/staging/wlags49_h2/wl_cs.c
View file

@ -133,9 +133,6 @@ static int wl_adapter_attach(struct pcmcia_device *link)
struct net_device *dev; struct net_device *dev;
struct wl_private *lp; struct wl_private *lp;
int ret; int ret;
/*--------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
dev = wl_device_alloc(); dev = wl_device_alloc();
if (dev == NULL) { 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) static void wl_adapter_detach(struct pcmcia_device *link)
{ {
struct net_device *dev = link->priv; struct net_device *dev = link->priv;
/*--------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
DBG_PARAM(DbgInfo, "link", "0x%p", link); DBG_PARAM(DbgInfo, "link", "0x%p", link);
wl_adapter_release(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) void wl_adapter_release(struct pcmcia_device *link)
{ {
DBG_ENTER(DbgInfo);
DBG_PARAM(DbgInfo, "link", "0x%p", link); DBG_PARAM(DbgInfo, "link", "0x%p", link);
/* Stop hardware */ /* Stop hardware */
@ -226,9 +220,7 @@ int wl_adapter_insert(struct pcmcia_device *link)
{ {
struct net_device *dev; struct net_device *dev;
int ret; int ret;
/*--------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
DBG_PARAM(DbgInfo, "link", "0x%p", link); DBG_PARAM(DbgInfo, "link", "0x%p", link);
dev = link->priv; dev = link->priv;
@ -299,9 +291,7 @@ int wl_adapter_open(struct net_device *dev)
struct pcmcia_device *link = lp->link; struct pcmcia_device *link = lp->link;
int result = 0; int result = 0;
int hcf_status = HCF_SUCCESS; int hcf_status = HCF_SUCCESS;
/*--------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
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);
@ -348,9 +338,7 @@ int wl_adapter_close(struct net_device *dev)
{ {
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
struct pcmcia_device *link = lp->link; struct pcmcia_device *link = lp->link;
/*--------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
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) {
@ -415,9 +403,7 @@ static struct pcmcia_driver wlags49_driver = {
int wl_adapter_init_module(void) int wl_adapter_init_module(void)
{ {
int ret; int ret;
/*--------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
DBG_TRACE(DbgInfo, "wl_adapter_init_module() -- PCMCIA\n"); DBG_TRACE(DbgInfo, "wl_adapter_init_module() -- PCMCIA\n");
ret = pcmcia_register_driver(&wlags49_driver); ret = pcmcia_register_driver(&wlags49_driver);
@ -447,7 +433,6 @@ int wl_adapter_init_module(void)
******************************************************************************/ ******************************************************************************/
void wl_adapter_cleanup_module(void) void wl_adapter_cleanup_module(void)
{ {
DBG_ENTER(DbgInfo);
DBG_TRACE(DbgInfo, "wl_adapter_cleanup_module() -- PCMCIA\n"); DBG_TRACE(DbgInfo, "wl_adapter_cleanup_module() -- PCMCIA\n");

60
drivers/staging/wlags49_h2/wl_main.c
View file

@ -434,8 +434,6 @@ int wl_insert( struct net_device *dev )
int i; int i;
unsigned long flags = 0; unsigned long flags = 0;
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
/* Initialize the adapter hardware. */ /* Initialize the adapter hardware. */
memset( &( lp->hcfCtx ), 0, sizeof( IFB_STRCT )); 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); struct wl_private *lp = wl_priv(dev);
int hcf_status = HCF_SUCCESS; int hcf_status = HCF_SUCCESS;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev ); DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev );
DBG_PARAM( DbgInfo, "dev->base_addr", "(%#03lx)", dev->base_addr ); 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; int hcf_status = HCF_SUCCESS;
char *cp = NULL; //fw_image char *cp = NULL; //fw_image
int retries = 0; int retries = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
hcf_status = wl_disable( lp ); hcf_status = wl_disable( lp );
if ( hcf_status != HCF_SUCCESS ) { if ( hcf_status != HCF_SUCCESS ) {
@ -1231,8 +1226,7 @@ int rc;
void wl_set_wep_keys( struct wl_private *lp ) void wl_set_wep_keys( struct wl_private *lp )
{ {
int count = 0; int count = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
DBG_PARAM( DbgInfo, "lp", "%s (0x%p)", lp->dev->name, lp ); DBG_PARAM( DbgInfo, "lp", "%s (0x%p)", lp->dev->name, lp );
if ( lp->EnableEncryption ) { if ( lp->EnableEncryption ) {
/* NOTE: CFG_CNF_ENCRYPTION is set in wl_put_ltv() as it's a static /* 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 wl_apply(struct wl_private *lp)
{ {
int hcf_status = HCF_SUCCESS; int hcf_status = HCF_SUCCESS;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
DBG_ASSERT( lp != NULL); DBG_ASSERT( lp != NULL);
DBG_PARAM( DbgInfo, "lp", "%s (0x%p)", lp->dev->name, lp ); 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 i;
int hcf_status; int hcf_status;
CFG_RID_LOG_STRCT *RidLog; CFG_RID_LOG_STRCT *RidLog;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
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 ); DBG_LEAVE( DbgInfo );
@ -1467,8 +1459,6 @@ int wl_put_ltv( struct wl_private *lp )
{ {
int len; int len;
int hcf_status; int hcf_status;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if ( lp == NULL ) { if ( lp == NULL ) {
DBG_ERROR( DbgInfo, "lp pointer is NULL\n" ); DBG_ERROR( DbgInfo, "lp pointer is NULL\n" );
@ -2059,7 +2049,6 @@ static int __init wl_module_init( void )
} }
#endif /* DBG */ #endif /* DBG */
DBG_ENTER( DbgInfo );
printk(KERN_INFO "%s\n", VERSION_INFO); 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 "*** 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"); 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 ) static void __exit wl_module_exit( void )
{ {
DBG_ENTER(DbgInfo);
wl_adapter_cleanup_module( ); wl_adapter_cleanup_module( );
#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
@ -2313,8 +2300,6 @@ void wl_remove( struct net_device *dev )
{ {
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev ); 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); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev ); 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); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev ); 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 ) void wl_release( struct net_device *dev )
{ {
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev ); DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev );
/* If wl_remove() hasn't been called (i.e. when Card Services is shut /* 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 wl_enable( struct wl_private *lp )
{ {
int hcf_status = HCF_SUCCESS; int hcf_status = HCF_SUCCESS;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if ( lp->portState == WVLAN_PORT_STATE_ENABLED ) { if ( lp->portState == WVLAN_PORT_STATE_ENABLED ) {
DBG_TRACE( DbgInfo, "No action: Card already enabled\n" ); 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 ) 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 ){ 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" );
} }
@ -2660,9 +2636,6 @@ void wl_enable_wds_ports( struct wl_private * lp )
int wl_connect( struct wl_private *lp ) int wl_connect( struct wl_private *lp )
{ {
int hcf_status; int hcf_status;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
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" );
@ -2699,9 +2672,6 @@ int wl_connect( struct wl_private *lp )
int wl_disconnect( struct wl_private *lp ) int wl_disconnect( struct wl_private *lp )
{ {
int hcf_status; int hcf_status;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
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" );
@ -2739,8 +2709,6 @@ int wl_disconnect( struct wl_private *lp )
int wl_disable( struct wl_private *lp ) int wl_disable( struct wl_private *lp )
{ {
int hcf_status = HCF_SUCCESS; int hcf_status = HCF_SUCCESS;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if ( lp->portState == WVLAN_PORT_STATE_DISABLED ) { if ( lp->portState == WVLAN_PORT_STATE_DISABLED ) {
DBG_TRACE( DbgInfo, "No action: Port state is disabled\n" ); 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 ) 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 ){ 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" );
} }
@ -2827,8 +2793,7 @@ void wl_disable_wds_ports( struct wl_private * lp )
int wl_mbx( struct wl_private *lp ) int wl_mbx( struct wl_private *lp )
{ {
int hcf_status = HCF_SUCCESS; int hcf_status = HCF_SUCCESS;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
DBG_TRACE( DbgInfo, "Mailbox Info: IFB_MBInfoLen: %d\n", DBG_TRACE( DbgInfo, "Mailbox Info: IFB_MBInfoLen: %d\n",
lp->hcfCtx.IFB_MBInfoLen ); lp->hcfCtx.IFB_MBInfoLen );
@ -2878,7 +2843,6 @@ int wl_mbx( struct wl_private *lp )
******************************************************************************/ ******************************************************************************/
void wl_endian_translate_mailbox( ltv_t *ltv ) void wl_endian_translate_mailbox( ltv_t *ltv )
{ {
DBG_ENTER( DbgInfo );
switch( ltv->typ ) { switch( ltv->typ ) {
case CFG_TALLIES: case CFG_TALLIES:
break; break;
@ -2993,8 +2957,7 @@ void wl_process_mailbox( struct wl_private *lp )
{ {
ltv_t *ltv; ltv_t *ltv;
hcf_16 ltv_val = 0xFFFF; hcf_16 ltv_val = 0xFFFF;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
ltv = &( lp->ltvRecord ); ltv = &( lp->ltvRecord );
switch( ltv->typ ) { switch( ltv->typ ) {
@ -3452,8 +3415,7 @@ void wl_process_mailbox( struct wl_private *lp )
void wl_wds_netdev_register( struct wl_private *lp ) void wl_wds_netdev_register( struct wl_private *lp )
{ {
int count; int count;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
//;?why is there no USE_WDS clause like in wl_enable_wds_ports //;?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 ) { if ( CNV_INT_TO_LITTLE( lp->hcfCtx.IFB_FWIdentity.comp_id ) == COMP_ID_FW_AP ) {
for( count = 0; count < NUM_WDS_PORTS; count++ ) { 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 ) void wl_wds_netdev_deregister( struct wl_private *lp )
{ {
int count; int count;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
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 ) {
for( count = 0; count < NUM_WDS_PORTS; count++ ) { for( count = 0; count < NUM_WDS_PORTS; count++ ) {
if ( WVLAN_VALID_MAC_ADDRESS( lp->wds_port[count].wdsAddress )) { 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]; static char proc_number[11];
unsigned int nr = 0; unsigned int nr = 0;
DBG_ENTER( DbgInfo );
if (count > 9) { if (count > 9) {
count = -EINVAL; count = -EINVAL;
} else if ( copy_from_user(proc_number, buffer, count) ) { } 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; struct wl_private *lp = (struct wl_private *)arg;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
DBG_PARAM( DbgInfo, "arg", "0x%08lx", arg ); 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 printk(KERN_NOTICE "timer_oor: %ld 0x%04X\n", jiffies, lp->timer_oor_cnt ); //;?remove me 1 day

33
drivers/staging/wlags49_h2/wl_netdev.c
View file

@ -170,9 +170,6 @@ int wl_init( struct net_device *dev )
{ {
// unsigned long flags; // unsigned long flags;
// struct wl_private *lp = wl_priv(dev); // struct wl_private *lp = wl_priv(dev);
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev ); 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 ) 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, "dev", "%s (0x%p)", dev->name, dev );
DBG_PARAM( DbgInfo, "map", "0x%p", map ); DBG_PARAM( DbgInfo, "map", "0x%p", map );
@ -247,9 +242,7 @@ struct net_device_stats *wl_stats( struct net_device *dev )
unsigned long flags; unsigned long flags;
struct net_device_stats *pStats; struct net_device_stats *pStats;
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
/*------------------------------------------------------------------------*/
//DBG_ENTER( DbgInfo );
//DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev ); //DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev );
pStats = NULL; pStats = NULL;
@ -312,9 +305,6 @@ int wl_open(struct net_device *dev)
int status = HCF_SUCCESS; int status = HCF_SUCCESS;
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
wl_lock( lp, &flags ); wl_lock( lp, &flags );
@ -407,9 +397,7 @@ int wl_close( struct net_device *dev )
{ {
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev); DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev);
/* Mark the adapter as busy */ /* 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); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev); DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev);
DBG_PARAM(DbgInfo, "rq", "0x%p", rq); DBG_PARAM(DbgInfo, "rq", "0x%p", rq);
DBG_PARAM(DbgInfo, "cmd", "0x%04x", cmd); DBG_PARAM(DbgInfo, "cmd", "0x%04x", cmd);
@ -600,9 +586,6 @@ void wl_tx_timeout( struct net_device *dev )
unsigned long flags; unsigned long flags;
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
struct net_device_stats *pStats = NULL; struct net_device_stats *pStats = NULL;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
DBG_WARNING( DbgInfo, "%s: Transmit timeout.\n", dev->name ); 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 netdev_hw_addr *ha;
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
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 )) {
@ -1142,8 +1123,6 @@ void wl_multicast( struct net_device *dev )
void wl_multicast( struct net_device *dev, int num_addrs, void *addrs ) 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, "dev", "%s (0x%p)", dev->name, dev );
DBG_PARAM( DbgInfo, "num_addrs", "%d", num_addrs ); DBG_PARAM( DbgInfo, "num_addrs", "%d", num_addrs );
DBG_PARAM( DbgInfo, "addrs", "0x%p", 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 net_device *dev = NULL;
struct wl_private *lp = NULL; struct wl_private *lp = NULL;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
/* Alloc a net_device struct */ /* Alloc a net_device struct */
dev = alloc_etherdev(sizeof(struct wl_private)); 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 ) void wl_device_dealloc( struct net_device *dev )
{ {
// struct wl_private *lp = wl_priv(dev); // struct wl_private *lp = wl_priv(dev);
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
/* Dealloc the WDS ports */ /* Dealloc the WDS ports */
WL_WDS_DEVICE_DEALLOC( lp ); 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 ) void wl_wds_device_alloc( struct wl_private *lp )
{ {
int count; int count;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
/* WDS support requires additional net_device structs to be allocated, /* WDS support requires additional net_device structs to be allocated,
so that user space apps can use these virtual devices to specify the 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 ) void wl_wds_device_dealloc( struct wl_private *lp )
{ {
int count; int count;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
for( count = 0; count < NUM_WDS_PORTS; count++ ) { for( count = 0; count < NUM_WDS_PORTS; count++ ) {
struct net_device *dev_wds = NULL; struct net_device *dev_wds = NULL;

48
drivers/staging/wlags49_h2/wl_pci.c
View file

@ -188,9 +188,7 @@ static struct pci_driver wl_driver = {
int wl_adapter_init_module( void ) int wl_adapter_init_module( void )
{ {
int result; int result;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
DBG_TRACE( DbgInfo, "wl_adapter_init_module() -- PCI\n" ); DBG_TRACE( DbgInfo, "wl_adapter_init_module() -- PCI\n" );
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
@ -221,9 +219,6 @@ int wl_adapter_init_module( void )
void wl_adapter_cleanup_module( void ) void wl_adapter_cleanup_module( void )
{ {
//;?how come wl_adapter_cleanup_module is located in a seemingly pci specific module //;?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" ); DBG_TRACE( DbgInfo, "wl_adapter_cleanup_module() -- PCI\n" );
pci_unregister_driver( &wl_driver ); pci_unregister_driver( &wl_driver );
@ -253,9 +248,6 @@ void wl_adapter_cleanup_module( void )
int wl_adapter_insert( struct net_device *dev ) int wl_adapter_insert( struct net_device *dev )
{ {
int result = FALSE; int result = FALSE;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
DBG_TRACE( DbgInfo, "wl_adapter_insert() -- PCI\n" ); DBG_TRACE( DbgInfo, "wl_adapter_insert() -- PCI\n" );
@ -294,9 +286,6 @@ int wl_adapter_open( struct net_device *dev )
{ {
int result = 0; int result = 0;
int hcf_status = HCF_SUCCESS; int hcf_status = HCF_SUCCESS;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
DBG_TRACE( DbgInfo, "wl_adapter_open() -- PCI\n" ); 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 ) int wl_adapter_close( struct net_device *dev )
{ {
DBG_ENTER( DbgInfo );
DBG_TRACE( DbgInfo, "wl_adapter_close() -- PCI\n" ); DBG_TRACE( DbgInfo, "wl_adapter_close() -- PCI\n" );
DBG_TRACE( DbgInfo, "%s: Shutting down adapter.\n", dev->name ); 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 ) const struct pci_device_id *ent )
{ {
int result; int result;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
DBG_PRINT( "%s\n", VERSION_INFO ); DBG_PRINT( "%s\n", VERSION_INFO );
result = wl_pci_setup( pdev ); 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) void wl_pci_remove(struct pci_dev *pdev)
{ {
struct net_device *dev = NULL; struct net_device *dev = NULL;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
/* Make sure the pci_dev pointer passed in is valid */ /* Make sure the pci_dev pointer passed in is valid */
if( pdev == NULL ) { if( pdev == NULL ) {
@ -485,9 +467,6 @@ int wl_pci_setup( struct pci_dev *pdev )
int result = 0; int result = 0;
struct net_device *dev = NULL; struct net_device *dev = NULL;
struct wl_private *lp = NULL; struct wl_private *lp = NULL;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
/* Make sure the pci_dev pointer passed in is valid */ /* Make sure the pci_dev pointer passed in is valid */
if( pdev == NULL ) { if( pdev == NULL ) {
@ -602,9 +581,6 @@ void wl_pci_enable_cardbus_interrupts( struct pci_dev *pdev )
u32 mem_addr_bus; u32 mem_addr_bus;
u32 func_evt_mask_reg; u32 func_evt_mask_reg;
void *mem_addr_kern = NULL; void *mem_addr_kern = NULL;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
/* Initialize to known bad values */ /* Initialize to known bad values */
bar2_reg = 0xdeadbeef; bar2_reg = 0xdeadbeef;
@ -665,9 +641,6 @@ int wl_pci_dma_alloc( struct pci_dev *pdev, struct wl_private *lp )
{ {
int i; int i;
int status = 0; int status = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
// lp->dma.tx_rsc_ind = lp->dma.rx_rsc_ind = 0; // 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 i;
int status = 0; int status = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
/* Reclaim all Rx packets that were handed over to the HCF */ /* 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 /* 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; // int status = 0;
// dma_addr_t pa; // dma_addr_t pa;
// /*------------------------------------------------------------------------*/
//
// DBG_ENTER( DbgInfo );
// //
// if( desc == NULL ) { // if( desc == NULL ) {
// status = -EFAULT; // status = -EFAULT;
@ -1185,9 +1152,6 @@ int wl_pci_dma_alloc_buf( struct pci_dev *pdev, struct wl_private *lp,
{ {
int status = 0; int status = 0;
dma_addr_t pa; dma_addr_t pa;
/*------------------------------------------------------------------------*/
// DBG_ENTER( DbgInfo );
// //
// if( desc == NULL ) { // if( desc == NULL ) {
// status = -EFAULT; // 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 ) void wl_pci_dma_hcf_supply( struct wl_private *lp )
{ {
int i; int i;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
//if( lp->dma.status == 0 ); //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 ) void wl_pci_dma_hcf_reclaim( struct wl_private *lp )
{ {
int i; int i;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
wl_pci_dma_hcf_reclaim_rx( lp ); wl_pci_dma_hcf_reclaim_rx( lp );
for( i = 0; i < NUM_RX_DESC; i++ ) { 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; int i;
DESC_STRCT *p; DESC_STRCT *p;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
//if( lp->dma.status == 0 ) //if( lp->dma.status == 0 )
//{ //{
@ -1521,9 +1476,6 @@ void wl_pci_dma_hcf_reclaim_tx( struct wl_private *lp )
{ {
int i; int i;
DESC_STRCT *p; DESC_STRCT *p;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
//if( lp->dma.status == 0 ) //if( lp->dma.status == 0 )
//{ //{

75
drivers/staging/wlags49_h2/wl_priv.c
View file

@ -130,9 +130,6 @@ extern dbg_info_t *DbgInfo;
int wvlan_uil(struct uilreq *urq, struct wl_private *lp) int wvlan_uil(struct uilreq *urq, struct wl_private *lp)
{ {
int ioctl_ret = 0; int ioctl_ret = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
switch (urq->command) { switch (urq->command) {
case UIL_FUN_CONNECT: case UIL_FUN_CONNECT:
@ -194,11 +191,6 @@ int wvlan_uil(struct uilreq *urq, struct wl_private *lp)
int wvlan_uil_connect(struct uilreq *urq, struct wl_private *lp) int wvlan_uil_connect(struct uilreq *urq, struct wl_private *lp)
{ {
int result = 0; int result = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
if (!(lp->flags & WVLAN2_UIL_CONNECTED)) { if (!(lp->flags & WVLAN2_UIL_CONNECTED)) {
lp->flags |= WVLAN2_UIL_CONNECTED; lp->flags |= WVLAN2_UIL_CONNECTED;
@ -239,11 +231,6 @@ int wvlan_uil_connect(struct uilreq *urq, struct wl_private *lp)
int wvlan_uil_disconnect(struct uilreq *urq, struct wl_private *lp) int wvlan_uil_disconnect(struct uilreq *urq, struct wl_private *lp)
{ {
int result = 0; int result = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
if (urq->hcfCtx == &(lp->hcfCtx)) { if (urq->hcfCtx == &(lp->hcfCtx)) {
if (lp->flags & WVLAN2_UIL_CONNECTED) { if (lp->flags & WVLAN2_UIL_CONNECTED) {
@ -294,11 +281,6 @@ int wvlan_uil_action(struct uilreq *urq, struct wl_private *lp)
{ {
int result = 0; int result = 0;
ltv_t *ltv; ltv_t *ltv;
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
if (urq->hcfCtx == &(lp->hcfCtx)) { if (urq->hcfCtx == &(lp->hcfCtx)) {
/* Make sure there's an LTV in the request buffer */ /* Make sure there's an LTV in the request buffer */
@ -372,10 +354,6 @@ int wvlan_uil_action(struct uilreq *urq, struct wl_private *lp)
int wvlan_uil_block(struct uilreq *urq, struct wl_private *lp) int wvlan_uil_block(struct uilreq *urq, struct wl_private *lp)
{ {
int result = 0; int result = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
if (urq->hcfCtx == &(lp->hcfCtx)) { if (urq->hcfCtx == &(lp->hcfCtx)) {
if (capable(CAP_NET_ADMIN)) { if (capable(CAP_NET_ADMIN)) {
@ -423,10 +401,6 @@ int wvlan_uil_block(struct uilreq *urq, struct wl_private *lp)
int wvlan_uil_unblock(struct uilreq *urq, struct wl_private *lp) int wvlan_uil_unblock(struct uilreq *urq, struct wl_private *lp)
{ {
int result = 0; int result = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
if (urq->hcfCtx == &(lp->hcfCtx)) { if (urq->hcfCtx == &(lp->hcfCtx)) {
if (capable(CAP_NET_ADMIN)) { if (capable(CAP_NET_ADMIN)) {
@ -476,10 +450,6 @@ int wvlan_uil_send_diag_msg(struct uilreq *urq, struct wl_private *lp)
{ {
int result = 0; int result = 0;
DESC_STRCT Descp[1]; DESC_STRCT Descp[1];
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
if (urq->hcfCtx == &(lp->hcfCtx)) { if (urq->hcfCtx == &(lp->hcfCtx)) {
if (capable(CAP_NET_ADMIN)) { if (capable(CAP_NET_ADMIN)) {
@ -568,9 +538,6 @@ int wvlan_uil_put_info(struct uilreq *urq, struct wl_private *lp)
#ifdef USE_WDS #ifdef USE_WDS
hcf_16 hcfPort = HCF_PORT_0; hcf_16 hcfPort = HCF_PORT_0;
#endif /* USE_WDS */ #endif /* USE_WDS */
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
if (urq->hcfCtx == &(lp->hcfCtx)) { if (urq->hcfCtx == &(lp->hcfCtx)) {
if (capable(CAP_NET_ADMIN)) { if (capable(CAP_NET_ADMIN)) {
@ -1183,9 +1150,6 @@ int wvlan_uil_get_info(struct uilreq *urq, struct wl_private *lp)
{ {
int result = 0; int result = 0;
int i; int i;
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
if (urq->hcfCtx == &(lp->hcfCtx)) { if (urq->hcfCtx == &(lp->hcfCtx)) {
if ((urq->data != NULL) && (urq->len != 0)) { if ((urq->data != NULL) && (urq->len != 0)) {
@ -1535,11 +1499,6 @@ int wvlan_uil_get_info(struct uilreq *urq, struct wl_private *lp)
int cfg_driver_info(struct uilreq *urq, struct wl_private *lp) int cfg_driver_info(struct uilreq *urq, struct wl_private *lp)
{ {
int result = 0; int result = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
/* Make sure that user buffer can handle the driver information buffer */ /* Make sure that user buffer can handle the driver information buffer */
if (urq->len < sizeof(lp->driverInfo)) { if (urq->len < sizeof(lp->driverInfo)) {
@ -1593,11 +1552,6 @@ int cfg_driver_info(struct uilreq *urq, struct wl_private *lp)
int cfg_driver_identity(struct uilreq *urq, struct wl_private *lp) int cfg_driver_identity(struct uilreq *urq, struct wl_private *lp)
{ {
int result = 0; int result = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
/* Make sure that user buffer can handle the driver identity structure. */ /* Make sure that user buffer can handle the driver identity structure. */
if (urq->len < sizeof(lp->driverIdentity)) { if (urq->len < sizeof(lp->driverIdentity)) {
@ -1661,10 +1615,6 @@ int wvlan_set_netname(struct net_device *dev,
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
wl_lock(lp, &flags); wl_lock(lp, &flags);
@ -1712,10 +1662,6 @@ int wvlan_get_netname(struct net_device *dev,
int ret = 0; int ret = 0;
int status = -1; int status = -1;
wvName_t *pName; wvName_t *pName;
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
wl_lock(lp, &flags); wl_lock(lp, &flags);
@ -1774,10 +1720,6 @@ int wvlan_set_station_nickname(struct net_device *dev,
unsigned long flags; unsigned long flags;
size_t len; size_t len;
int ret = 0; int ret = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
wl_lock(lp, &flags); wl_lock(lp, &flags);
@ -1826,10 +1768,6 @@ int wvlan_get_station_nickname(struct net_device *dev,
int ret = 0; int ret = 0;
int status = -1; int status = -1;
wvName_t *pName; wvName_t *pName;
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
wl_lock(lp, &flags); wl_lock(lp, &flags);
@ -1888,10 +1826,6 @@ int wvlan_set_porttype(struct net_device *dev,
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
hcf_16 portType; hcf_16 portType;
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
wl_lock(lp, &flags); wl_lock(lp, &flags);
@ -1949,10 +1883,6 @@ int wvlan_get_porttype(struct net_device *dev,
int status = -1; int status = -1;
hcf_16 *pPortType; hcf_16 *pPortType;
__u32 *pData = (__u32 *)extra; __u32 *pData = (__u32 *)extra;
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
wl_lock(lp, &flags); wl_lock(lp, &flags);
@ -2006,11 +1936,6 @@ int wvlan_get_porttype(struct net_device *dev,
int wvlan_rts(struct rtsreq *rrq, __u32 io_base) int wvlan_rts(struct rtsreq *rrq, __u32 io_base)
{ {
int ioctl_ret = 0; int ioctl_ret = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
DBG_PRINT("io_base: 0x%08x\n", io_base); DBG_PRINT("io_base: 0x%08x\n", io_base);

6
drivers/staging/wlags49_h2/wl_profile.c
View file

@ -163,9 +163,6 @@ void parse_config(struct net_device *dev)
mm_segment_t fs; mm_segment_t fs;
struct wl_private *wvlan_config = NULL; struct wl_private *wvlan_config = NULL;
ENCSTRCT sEncryption; ENCSTRCT sEncryption;
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
/* Get the wavelan specific info for this device */ /* Get the wavelan specific info for this device */
wvlan_config = dev->priv; wvlan_config = dev->priv;
@ -956,9 +953,6 @@ void ParseConfigLine(char *pszLine, char **ppszLVal, char **ppszRVal)
{ {
int i; int i;
int size; int size;
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
/* get a snapshot of our string size */ /* get a snapshot of our string size */
size = strlen(pszLine); size = strlen(pszLine);

26
drivers/staging/wlags49_h2/wl_util.c
View file

@ -481,9 +481,6 @@ void wl_hcf_error( struct net_device *dev, int hcfStatus )
******************************************************************************/ ******************************************************************************/
void wl_endian_translate_event( ltv_t *pLtv ) void wl_endian_translate_event( ltv_t *pLtv )
{ {
DBG_ENTER( DbgInfo );
switch( pLtv->typ ) { switch( pLtv->typ ) {
case CFG_TALLIES: case CFG_TALLIES:
break; break;
@ -996,9 +993,6 @@ int wl_get_chan_from_freq( long frequency )
void wl_process_link_status( struct wl_private *lp ) void wl_process_link_status( struct wl_private *lp )
{ {
hcf_16 link_stat; hcf_16 link_stat;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if( lp != NULL ) { if( lp != NULL ) {
//link_stat = lp->hcfCtx.IFB_DSLinkStat & CFG_LINK_STAT_FW; //link_stat = lp->hcfCtx.IFB_DSLinkStat & CFG_LINK_STAT_FW;
@ -1056,11 +1050,6 @@ void wl_process_probe_response( struct wl_private *lp )
PROBE_RESP *probe_rsp; PROBE_RESP *probe_rsp;
hcf_8 *wpa_ie = NULL; hcf_8 *wpa_ie = NULL;
hcf_16 wpa_ie_len = 0; hcf_16 wpa_ie_len = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if( lp != NULL ) { if( lp != NULL ) {
probe_rsp = (PROBE_RESP *)&lp->ProbeResp; probe_rsp = (PROBE_RESP *)&lp->ProbeResp;
@ -1260,9 +1249,6 @@ void wl_process_probe_response( struct wl_private *lp )
******************************************************************************/ ******************************************************************************/
void wl_process_updated_record( struct wl_private *lp ) void wl_process_updated_record( struct wl_private *lp )
{ {
DBG_ENTER( DbgInfo );
if( lp != NULL ) { if( lp != NULL ) {
lp->updatedRecord.u.u16[0] = CNV_LITTLE_TO_INT( lp->updatedRecord.u.u16[0] ); lp->updatedRecord.u.u16[0] = CNV_LITTLE_TO_INT( lp->updatedRecord.u.u16[0] );
@ -1311,11 +1297,6 @@ void wl_process_updated_record( struct wl_private *lp )
void wl_process_assoc_status( struct wl_private *lp ) void wl_process_assoc_status( struct wl_private *lp )
{ {
ASSOC_STATUS_STRCT *assoc_stat; ASSOC_STATUS_STRCT *assoc_stat;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if( lp != NULL ) { if( lp != NULL ) {
assoc_stat = (ASSOC_STATUS_STRCT *)&lp->assoc_stat; assoc_stat = (ASSOC_STATUS_STRCT *)&lp->assoc_stat;
@ -1377,11 +1358,6 @@ void wl_process_assoc_status( struct wl_private *lp )
void wl_process_security_status( struct wl_private *lp ) void wl_process_security_status( struct wl_private *lp )
{ {
SECURITY_STATUS_STRCT *sec_stat; SECURITY_STATUS_STRCT *sec_stat;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if( lp != NULL ) { if( lp != NULL ) {
sec_stat = (SECURITY_STATUS_STRCT *)&lp->sec_stat; sec_stat = (SECURITY_STATUS_STRCT *)&lp->sec_stat;
@ -1432,8 +1408,6 @@ int wl_get_tallies(struct wl_private *lp,
int status; int status;
CFG_HERMES_TALLIES_STRCT *pTallies; CFG_HERMES_TALLIES_STRCT *pTallies;
DBG_ENTER(DbgInfo);
/* Get the current tallies from the adapter */ /* Get the current tallies from the adapter */
lp->ltvRecord.len = 1 + HCF_TOT_TAL_CNT * sizeof(hcf_16); lp->ltvRecord.len = 1 + HCF_TOT_TAL_CNT * sizeof(hcf_16);
lp->ltvRecord.typ = CFG_TALLIES; lp->ltvRecord.typ = CFG_TALLIES;

106
drivers/staging/wlags49_h2/wl_wext.c
View file

@ -93,8 +93,6 @@ static int hermes_set_tkip_keys(ltv_t *ltv, u16 key_idx, u8 *addr,
hcf_8 tsc[IW_ENCODE_SEQ_MAX_SIZE] = hcf_8 tsc[IW_ENCODE_SEQ_MAX_SIZE] =
{ 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 }; { 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 };
DBG_ENTER(DbgInfo);
/* /*
* Check the key index here; if 0, load as Pairwise Key, otherwise, * Check the key index here; if 0, load as Pairwise Key, otherwise,
* load as a group key. Note that for the Hermes, the RIDs for * load as a group key. Note that for the Hermes, the RIDs for
@ -327,9 +325,6 @@ static int wireless_commit(struct net_device *dev,
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
@ -375,8 +370,6 @@ out:
******************************************************************************/ ******************************************************************************/
static int wireless_get_protocol(struct net_device *dev, struct iw_request_info *info, char *name, char *extra) static int wireless_get_protocol(struct net_device *dev, struct iw_request_info *info, char *name, char *extra)
{ {
DBG_ENTER( DbgInfo );
/* Originally, the driver was placing the string "Wireless" here. However, /* Originally, the driver was placing the string "Wireless" here. However,
the wireless extensions (/linux/wireless.h) indicate this string should the wireless extensions (/linux/wireless.h) indicate this string should
describe the wireless protocol. */ describe the wireless protocol. */
@ -416,9 +409,6 @@ static int wireless_set_frequency(struct net_device *dev, struct iw_request_info
unsigned long flags; unsigned long flags;
int channel = 0; int channel = 0;
int ret = 0; int ret = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
@ -501,10 +491,6 @@ static int wireless_get_frequency(struct net_device *dev, struct iw_request_info
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
int ret = -1; int ret = -1;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
@ -571,10 +557,6 @@ static int wireless_get_range(struct net_device *dev, struct iw_request_info *in
int count; int count;
__u16 *pTxRate; __u16 *pTxRate;
int retries = 0; int retries = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
/* Set range information */ /* Set range information */
data->length = sizeof(struct iw_range); data->length = sizeof(struct iw_range);
@ -775,10 +757,6 @@ static int wireless_get_bssid(struct net_device *dev, struct iw_request_info *in
#if 1 //;? (HCF_TYPE) & HCF_TYPE_STA #if 1 //;? (HCF_TYPE) & HCF_TYPE_STA
int status = -1; int status = -1;
#endif /* (HCF_TYPE) & HCF_TYPE_STA */ #endif /* (HCF_TYPE) & HCF_TYPE_STA */
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
@ -867,9 +845,6 @@ static int wireless_get_ap_list (struct net_device *dev, struct iw_request_info
#else #else
ProbeResult *p = &lp->probe_results; ProbeResult *p = &lp->probe_results;
#endif // WARP #endif // WARP
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
@ -1002,10 +977,6 @@ static int wireless_set_sensitivity(struct net_device *dev, struct iw_request_in
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
int dens = sens->value; int dens = sens->value;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
@ -1060,11 +1031,6 @@ static int wireless_get_sensitivity(struct net_device *dev, struct iw_request_in
{ {
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
int ret = 0; int ret = 0;
/*------------------------------------------------------------------------*/
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
@ -1109,8 +1075,6 @@ static int wireless_set_essid(struct net_device *dev, struct iw_request_info *in
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
DBG_ENTER( DbgInfo );
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
goto out; goto out;
@ -1190,10 +1154,6 @@ static int wireless_get_essid(struct net_device *dev, struct iw_request_info *in
int ret = 0; int ret = 0;
int status = -1; int status = -1;
wvName_t *pName; wvName_t *pName;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
@ -1323,8 +1283,6 @@ static int wireless_set_encode(struct net_device *dev, struct iw_request_info *i
int ret = 0; int ret = 0;
bool enable = true; bool enable = true;
DBG_ENTER(DbgInfo);
if (lp->portState == WVLAN_PORT_STATE_DISABLED) { if (lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
goto out; goto out;
@ -1379,10 +1337,7 @@ static int wireless_get_encode(struct net_device *dev, struct iw_request_info *i
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
int index; int index;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
DBG_NOTICE(DbgInfo, "GIWENCODE: encrypt: %d, ID: %d\n", lp->EnableEncryption, lp->TransmitKeyID); DBG_NOTICE(DbgInfo, "GIWENCODE: encrypt: %d, ID: %d\n", lp->EnableEncryption, lp->TransmitKeyID);
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
@ -1469,10 +1424,6 @@ static int wireless_set_nickname(struct net_device *dev, struct iw_request_info
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
@ -1543,10 +1494,6 @@ static int wireless_get_nickname(struct net_device *dev, struct iw_request_info
int ret = 0; int ret = 0;
int status = -1; int status = -1;
wvName_t *pName; wvName_t *pName;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
@ -1619,9 +1566,6 @@ static int wireless_set_porttype(struct net_device *dev, struct iw_request_info
int ret = 0; int ret = 0;
hcf_16 portType; hcf_16 portType;
hcf_16 createIBSS; hcf_16 createIBSS;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
@ -1733,10 +1677,6 @@ static int wireless_get_porttype(struct net_device *dev, struct iw_request_info
int ret = 0; int ret = 0;
int status = -1; int status = -1;
hcf_16 *pPortType; hcf_16 *pPortType;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
@ -1839,10 +1779,6 @@ static int wireless_set_power(struct net_device *dev, struct iw_request_info *in
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
@ -1912,8 +1848,6 @@ static int wireless_get_power(struct net_device *dev, struct iw_request_info *in
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
@ -1972,8 +1906,6 @@ static int wireless_get_tx_power(struct net_device *dev, struct iw_request_info
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
@ -2032,10 +1964,6 @@ static int wireless_set_rts_threshold (struct net_device *dev, struct iw_request
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
int rthr = rts->value; int rthr = rts->value;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
@ -2101,9 +2029,6 @@ static int wireless_get_rts_threshold (struct net_device *dev, struct iw_request
int ret = 0; int ret = 0;
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
unsigned long flags; unsigned long flags;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
@ -2162,10 +2087,6 @@ static int wireless_set_rate(struct net_device *dev, struct iw_request_info *inf
int status = -1; int status = -1;
int index = 0; int index = 0;
#endif // WARP #endif // WARP
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
@ -2387,10 +2308,6 @@ static int wireless_get_rate(struct net_device *dev, struct iw_request_info *inf
int ret = 0; int ret = 0;
int status = -1; int status = -1;
hcf_16 txRate; hcf_16 txRate;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
@ -2498,10 +2415,6 @@ out:
int wireless_get_private_interface( struct iwreq *wrq, struct wl_private *lp ) int wireless_get_private_interface( struct iwreq *wrq, struct wl_private *lp )
{ {
int ret = 0; int ret = 0;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
@ -2567,12 +2480,9 @@ static int wireless_set_scan(struct net_device *dev, struct iw_request_info *inf
int ret = 0; int ret = 0;
int status = -1; int status = -1;
int retries = 0; int retries = 0;
/*------------------------------------------------------------------------*/
//;? Note: shows results as trace, returns always 0 unless BUSY //;? Note: shows results as trace, returns always 0 unless BUSY
DBG_ENTER( DbgInfo );
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
goto out; goto out;
@ -2708,10 +2618,6 @@ static int wireless_get_scan(struct net_device *dev, struct iw_request_info *inf
hcf_8 msg[512]; hcf_8 msg[512];
hcf_8 *wpa_ie; hcf_8 *wpa_ie;
hcf_16 wpa_ie_len; hcf_16 wpa_ie_len;
/*------------------------------------------------------------------------*/
DBG_ENTER( DbgInfo );
if(lp->portState == WVLAN_PORT_STATE_DISABLED) { if(lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
@ -2896,8 +2802,6 @@ static int wireless_set_auth(struct net_device *dev,
int iwa_idx = data->flags & IW_AUTH_INDEX; int iwa_idx = data->flags & IW_AUTH_INDEX;
int iwa_val = data->value; int iwa_val = data->value;
DBG_ENTER( DbgInfo );
if (lp->portState == WVLAN_PORT_STATE_DISABLED) { if (lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
goto out; goto out;
@ -3059,8 +2963,6 @@ static int wireless_set_encodeext(struct net_device *dev,
bool enable = true; bool enable = true;
bool set_tx = false; bool set_tx = false;
DBG_ENTER(DbgInfo);
if (lp->portState == WVLAN_PORT_STATE_DISABLED) { if (lp->portState == WVLAN_PORT_STATE_DISABLED) {
ret = -EBUSY; ret = -EBUSY;
goto out; goto out;
@ -3174,8 +3076,6 @@ static int wireless_set_genie(struct net_device *dev,
{ {
int ret = 0; int ret = 0;
DBG_ENTER(DbgInfo);
/* We can't write this to the card, but apparently this /* We can't write this to the card, but apparently this
* operation needs to succeed */ * operation needs to succeed */
ret = 0; ret = 0;
@ -3209,10 +3109,7 @@ struct iw_statistics * wl_wireless_stats( struct net_device *dev )
{ {
struct iw_statistics *pStats; struct iw_statistics *pStats;
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev); DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev);
pStats = NULL; pStats = NULL;
@ -3307,9 +3204,6 @@ struct iw_statistics * wl_get_wireless_stats( struct net_device *dev )
unsigned long flags; unsigned long flags;
struct wl_private *lp = wl_priv(dev); struct wl_private *lp = wl_priv(dev);
struct iw_statistics *pStats = NULL; struct iw_statistics *pStats = NULL;
/*------------------------------------------------------------------------*/
DBG_ENTER(DbgInfo);
wl_lock( lp, &flags ); wl_lock( lp, &flags );