From: Greg Kroah-Hartman Date: Thu, 9 Jan 2014 16:57:49 +0000 (-0800) Subject: staging: wlags49_h2: remove empty DBG_FUNC() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=064d5a72d0f8bc880fdbdd06a007a387919be848;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git staging: wlags49_h2: remove empty DBG_FUNC() DBG_FUNC() didn't even do anything, so no need for it to be present in the code at all. Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/wlags49_h2/debug.h b/drivers/staging/wlags49_h2/debug.h index 811698f1070c..b7275e92137c 100644 --- a/drivers/staging/wlags49_h2/debug.h +++ b/drivers/staging/wlags49_h2/debug.h @@ -137,8 +137,6 @@ _LEAVE_STR, __func__) -#define DBG_FUNC(F) - #define DBG_ENTER(A) {if (DBG_FLAGS(A) & DBG_TRACE_ON) \ _DBG_ENTER(A); } @@ -209,7 +207,6 @@ typedef struct { #define DBG_DEFN #define DBG_TRAP -#define DBG_FUNC(F) #define DBG_PRINT(S...) #define DBG_ENTER(A) #define DBG_LEAVE(A) diff --git a/drivers/staging/wlags49_h2/wl_cs.c b/drivers/staging/wlags49_h2/wl_cs.c index a458705a379c..fdfa2cb51185 100644 --- a/drivers/staging/wlags49_h2/wl_cs.c +++ b/drivers/staging/wlags49_h2/wl_cs.c @@ -135,7 +135,6 @@ static int wl_adapter_attach(struct pcmcia_device *link) int ret; /*--------------------------------------------------------------------*/ - DBG_FUNC("wl_adapter_attach"); DBG_ENTER(DbgInfo); dev = wl_device_alloc(); @@ -170,7 +169,6 @@ static void wl_adapter_detach(struct pcmcia_device *link) struct net_device *dev = link->priv; /*--------------------------------------------------------------------*/ - DBG_FUNC("wl_adapter_detach"); DBG_ENTER(DbgInfo); DBG_PARAM(DbgInfo, "link", "0x%p", link); @@ -188,7 +186,6 @@ static void wl_adapter_detach(struct pcmcia_device *link) void wl_adapter_release(struct pcmcia_device *link) { - DBG_FUNC("wl_adapter_release"); DBG_ENTER(DbgInfo); DBG_PARAM(DbgInfo, "link", "0x%p", link); @@ -231,7 +228,6 @@ int wl_adapter_insert(struct pcmcia_device *link) int ret; /*--------------------------------------------------------------------*/ - DBG_FUNC("wl_adapter_insert"); DBG_ENTER(DbgInfo); DBG_PARAM(DbgInfo, "link", "0x%p", link); @@ -305,7 +301,6 @@ int wl_adapter_open(struct net_device *dev) int hcf_status = HCF_SUCCESS; /*--------------------------------------------------------------------*/ - DBG_FUNC("wl_adapter_open"); DBG_ENTER(DbgInfo); DBG_PRINT("%s\n", VERSION_INFO); DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev); @@ -355,7 +350,6 @@ int wl_adapter_close(struct net_device *dev) struct pcmcia_device *link = lp->link; /*--------------------------------------------------------------------*/ - DBG_FUNC("wl_adapter_close"); DBG_ENTER(DbgInfo); DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev); @@ -423,7 +417,6 @@ int wl_adapter_init_module(void) int ret; /*--------------------------------------------------------------------*/ - DBG_FUNC("wl_adapter_init_module"); DBG_ENTER(DbgInfo); DBG_TRACE(DbgInfo, "wl_adapter_init_module() -- PCMCIA\n"); @@ -454,7 +447,6 @@ int wl_adapter_init_module(void) ******************************************************************************/ void wl_adapter_cleanup_module(void) { - DBG_FUNC("wl_adapter_cleanup_module"); DBG_ENTER(DbgInfo); DBG_TRACE(DbgInfo, "wl_adapter_cleanup_module() -- PCMCIA\n"); diff --git a/drivers/staging/wlags49_h2/wl_main.c b/drivers/staging/wlags49_h2/wl_main.c index 43535610acc4..4e1255dc8f8d 100644 --- a/drivers/staging/wlags49_h2/wl_main.c +++ b/drivers/staging/wlags49_h2/wl_main.c @@ -435,7 +435,6 @@ int wl_insert( struct net_device *dev ) unsigned long flags = 0; struct wl_private *lp = wl_priv(dev); /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_insert" ); DBG_ENTER( DbgInfo ); /* Initialize the adapter hardware. */ @@ -973,7 +972,6 @@ int wl_reset(struct net_device *dev) struct wl_private *lp = wl_priv(dev); int hcf_status = HCF_SUCCESS; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_reset" ); DBG_ENTER( DbgInfo ); DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev ); DBG_PARAM( DbgInfo, "dev->base_addr", "(%#03lx)", dev->base_addr ); @@ -1050,7 +1048,6 @@ int wl_go( struct wl_private *lp ) char *cp = NULL; //fw_image int retries = 0; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_go" ); DBG_ENTER( DbgInfo ); hcf_status = wl_disable( lp ); @@ -1235,7 +1232,6 @@ void wl_set_wep_keys( struct wl_private *lp ) { int count = 0; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_set_wep_keys" ); DBG_ENTER( DbgInfo ); DBG_PARAM( DbgInfo, "lp", "%s (0x%p)", lp->dev->name, lp ); if ( lp->EnableEncryption ) { @@ -1302,7 +1298,6 @@ int wl_apply(struct wl_private *lp) { int hcf_status = HCF_SUCCESS; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_apply" ); DBG_ENTER( DbgInfo ); DBG_ASSERT( lp != NULL); DBG_PARAM( DbgInfo, "lp", "%s (0x%p)", lp->dev->name, lp ); @@ -1376,7 +1371,6 @@ int wl_put_ltv_init( struct wl_private *lp ) int hcf_status; CFG_RID_LOG_STRCT *RidLog; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_put_ltv_init" ); DBG_ENTER( DbgInfo ); if ( lp == NULL ) { DBG_ERROR( DbgInfo, "lp pointer is NULL\n" ); @@ -1474,7 +1468,6 @@ int wl_put_ltv( struct wl_private *lp ) int len; int hcf_status; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_put_ltv" ); DBG_ENTER( DbgInfo ); if ( lp == NULL ) { @@ -2042,7 +2035,6 @@ static int __init wl_module_init( void ) int result; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_module_init" ); #if DBG /* Convert "standard" PCMCIA parameter pc_debug to a reasonable DebugFlag value. @@ -2105,7 +2097,6 @@ static int __init wl_module_init( void ) ******************************************************************************/ static void __exit wl_module_exit( void ) { - DBG_FUNC( "wl_module_exit" ); DBG_ENTER(DbgInfo); wl_adapter_cleanup_module( ); @@ -2323,7 +2314,6 @@ void wl_remove( struct net_device *dev ) struct wl_private *lp = wl_priv(dev); unsigned long flags; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_remove" ); DBG_ENTER( DbgInfo ); DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev ); @@ -2395,7 +2385,6 @@ void wl_suspend( struct net_device *dev ) struct wl_private *lp = wl_priv(dev); unsigned long flags; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_suspend" ); DBG_ENTER( DbgInfo ); DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev ); @@ -2451,7 +2440,6 @@ void wl_resume(struct net_device *dev) struct wl_private *lp = wl_priv(dev); unsigned long flags; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_resume" ); DBG_ENTER( DbgInfo ); DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev ); @@ -2505,7 +2493,6 @@ void wl_release( struct net_device *dev ) { struct wl_private *lp = wl_priv(dev); /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_release" ); DBG_ENTER( DbgInfo ); DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev ); @@ -2594,7 +2581,6 @@ int wl_enable( struct wl_private *lp ) { int hcf_status = HCF_SUCCESS; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_enable" ); DBG_ENTER( DbgInfo ); if ( lp->portState == WVLAN_PORT_STATE_ENABLED ) { @@ -2643,8 +2629,6 @@ int wl_enable( struct wl_private *lp ) ******************************************************************************/ void wl_enable_wds_ports( struct wl_private * lp ) { - - DBG_FUNC( "wl_enable_wds_ports" ); DBG_ENTER( DbgInfo ); if ( CNV_INT_TO_LITTLE( lp->hcfCtx.IFB_FWIdentity.comp_id ) == COMP_ID_FW_AP ){ DBG_ERROR( DbgInfo, "!!!!;? someone misunderstood something !!!!!\n" ); @@ -2678,7 +2662,6 @@ int wl_connect( struct wl_private *lp ) int hcf_status; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_connect" ); DBG_ENTER( DbgInfo ); if ( lp->portState != WVLAN_PORT_STATE_ENABLED ) { @@ -2718,7 +2701,6 @@ int wl_disconnect( struct wl_private *lp ) int hcf_status; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_disconnect" ); DBG_ENTER( DbgInfo ); if ( lp->portState != WVLAN_PORT_STATE_CONNECTED ) { @@ -2758,7 +2740,6 @@ int wl_disable( struct wl_private *lp ) { int hcf_status = HCF_SUCCESS; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_disable" ); DBG_ENTER( DbgInfo ); if ( lp->portState == WVLAN_PORT_STATE_DISABLED ) { @@ -2805,8 +2786,6 @@ int wl_disable( struct wl_private *lp ) ******************************************************************************/ void wl_disable_wds_ports( struct wl_private * lp ) { - - DBG_FUNC( "wl_disable_wds_ports" ); DBG_ENTER( DbgInfo ); if ( CNV_INT_TO_LITTLE( lp->hcfCtx.IFB_FWIdentity.comp_id ) == COMP_ID_FW_AP ){ @@ -2849,7 +2828,6 @@ int wl_mbx( struct wl_private *lp ) { int hcf_status = HCF_SUCCESS; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_mbx" ); DBG_ENTER( DbgInfo ); DBG_TRACE( DbgInfo, "Mailbox Info: IFB_MBInfoLen: %d\n", lp->hcfCtx.IFB_MBInfoLen ); @@ -2900,8 +2878,6 @@ int wl_mbx( struct wl_private *lp ) ******************************************************************************/ void wl_endian_translate_mailbox( ltv_t *ltv ) { - - DBG_FUNC( "wl_endian_translate_mailbox" ); DBG_ENTER( DbgInfo ); switch( ltv->typ ) { case CFG_TALLIES: @@ -3018,7 +2994,6 @@ void wl_process_mailbox( struct wl_private *lp ) ltv_t *ltv; hcf_16 ltv_val = 0xFFFF; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_process_mailbox" ); DBG_ENTER( DbgInfo ); ltv = &( lp->ltvRecord ); @@ -3478,7 +3453,6 @@ void wl_wds_netdev_register( struct wl_private *lp ) { int count; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_wds_netdev_register" ); DBG_ENTER( DbgInfo ); //;?why is there no USE_WDS clause like in wl_enable_wds_ports if ( CNV_INT_TO_LITTLE( lp->hcfCtx.IFB_FWIdentity.comp_id ) == COMP_ID_FW_AP ) { @@ -3525,7 +3499,6 @@ void wl_wds_netdev_deregister( struct wl_private *lp ) { int count; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_wds_netdev_deregister" ); DBG_ENTER( DbgInfo ); if ( CNV_INT_TO_LITTLE( lp->hcfCtx.IFB_FWIdentity.comp_id ) == COMP_ID_FW_AP ) { for( count = 0; count < NUM_WDS_PORTS; count++ ) { @@ -3780,7 +3753,6 @@ static int write_int(struct file *file, const char *buffer, unsigned long count, static char proc_number[11]; unsigned int nr = 0; - DBG_FUNC( "write_int" ); DBG_ENTER( DbgInfo ); if (count > 9) { @@ -3841,7 +3813,6 @@ void timer_oor( u_long arg ) /*------------------------------------------------------------------------*/ - DBG_FUNC( "timer_oor" ); DBG_ENTER( DbgInfo ); DBG_PARAM( DbgInfo, "arg", "0x%08lx", arg ); diff --git a/drivers/staging/wlags49_h2/wl_netdev.c b/drivers/staging/wlags49_h2/wl_netdev.c index 235cc2a7ffe6..20f55ba96443 100644 --- a/drivers/staging/wlags49_h2/wl_netdev.c +++ b/drivers/staging/wlags49_h2/wl_netdev.c @@ -172,7 +172,6 @@ int wl_init( struct net_device *dev ) // struct wl_private *lp = wl_priv(dev); /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_init" ); DBG_ENTER( DbgInfo ); DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev ); @@ -208,7 +207,6 @@ int wl_init( struct net_device *dev ) ******************************************************************************/ int wl_config( struct net_device *dev, struct ifmap *map ) { - DBG_FUNC( "wl_config" ); DBG_ENTER( DbgInfo ); DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev ); @@ -251,7 +249,6 @@ struct net_device_stats *wl_stats( struct net_device *dev ) struct wl_private *lp = wl_priv(dev); /*------------------------------------------------------------------------*/ - //DBG_FUNC( "wl_stats" ); //DBG_ENTER( DbgInfo ); //DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev ); @@ -317,7 +314,6 @@ int wl_open(struct net_device *dev) unsigned long flags; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_open" ); DBG_ENTER( DbgInfo ); wl_lock( lp, &flags ); @@ -413,7 +409,6 @@ int wl_close( struct net_device *dev ) unsigned long flags; /*------------------------------------------------------------------------*/ - DBG_FUNC("wl_close"); DBG_ENTER(DbgInfo); DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev); @@ -506,7 +501,6 @@ int wl_ioctl( struct net_device *dev, struct ifreq *rq, int cmd ) int ret = 0; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_ioctl" ); DBG_ENTER(DbgInfo); DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev); DBG_PARAM(DbgInfo, "rq", "0x%p", rq); @@ -608,7 +602,6 @@ void wl_tx_timeout( struct net_device *dev ) struct net_device_stats *pStats = NULL; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_tx_timeout" ); DBG_ENTER( DbgInfo ); DBG_WARNING( DbgInfo, "%s: Transmit timeout.\n", dev->name ); @@ -683,8 +676,6 @@ int wl_send( struct wl_private *lp ) int len; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_send" ); - if( lp == NULL ) { DBG_ERROR( DbgInfo, "Private adapter struct is NULL\n" ); return FALSE; @@ -801,8 +792,6 @@ int wl_tx( struct sk_buff *skb, struct net_device *dev, int port ) struct list_head *element; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_tx" ); - /* Grab the spinlock */ wl_lock( lp, &flags ); @@ -895,7 +884,6 @@ int wl_rx(struct net_device *dev) DESC_STRCT *desc; /*------------------------------------------------------------------------*/ - DBG_FUNC("wl_rx") DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev); if(!( lp->flags & WVLAN2_UIL_BUSY )) { @@ -1049,7 +1037,6 @@ void wl_multicast( struct net_device *dev ) unsigned long flags; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_multicast" ); DBG_ENTER( DbgInfo ); DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev ); @@ -1155,7 +1142,6 @@ void wl_multicast( struct net_device *dev ) void wl_multicast( struct net_device *dev, int num_addrs, void *addrs ) { - DBG_FUNC( "wl_multicast"); DBG_ENTER(DbgInfo); DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev ); @@ -1215,7 +1201,6 @@ struct net_device * wl_device_alloc( void ) struct wl_private *lp = NULL; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_device_alloc" ); DBG_ENTER( DbgInfo ); /* Alloc a net_device struct */ @@ -1281,7 +1266,6 @@ void wl_device_dealloc( struct net_device *dev ) // struct wl_private *lp = wl_priv(dev); /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_device_dealloc" ); DBG_ENTER( DbgInfo ); /* Dealloc the WDS ports */ @@ -1498,7 +1482,6 @@ void wl_wds_device_alloc( struct wl_private *lp ) int count; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_wds_device_alloc" ); DBG_ENTER( DbgInfo ); /* WDS support requires additional net_device structs to be allocated, @@ -1569,7 +1552,6 @@ void wl_wds_device_dealloc( struct wl_private *lp ) int count; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_wds_device_dealloc" ); DBG_ENTER( DbgInfo ); for( count = 0; count < NUM_WDS_PORTS; count++ ) { @@ -1792,8 +1774,6 @@ int wl_send_dma( struct wl_private *lp, struct sk_buff *skb, int port ) DESC_STRCT *desc_next = NULL; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_send_dma" ); - if( lp == NULL ) { DBG_ERROR( DbgInfo, "Private adapter struct is NULL\n" ); return FALSE; @@ -1882,7 +1862,6 @@ int wl_rx_dma( struct net_device *dev ) //CFG_MB_INFO_RANGE2_STRCT x; /*------------------------------------------------------------------------*/ - DBG_FUNC("wl_rx") DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev); if((( lp = dev->priv ) != NULL ) && diff --git a/drivers/staging/wlags49_h2/wl_pci.c b/drivers/staging/wlags49_h2/wl_pci.c index 841ffac7f6a4..178a90616ee1 100644 --- a/drivers/staging/wlags49_h2/wl_pci.c +++ b/drivers/staging/wlags49_h2/wl_pci.c @@ -190,7 +190,6 @@ int wl_adapter_init_module( void ) int result; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_adapter_init_module()" ); DBG_ENTER( DbgInfo ); DBG_TRACE( DbgInfo, "wl_adapter_init_module() -- PCI\n" ); @@ -222,7 +221,6 @@ int wl_adapter_init_module( void ) void wl_adapter_cleanup_module( void ) { //;?how come wl_adapter_cleanup_module is located in a seemingly pci specific module - DBG_FUNC( "wl_adapter_cleanup_module" ); DBG_ENTER( DbgInfo ); //;?DBG_TRACE below feels like nearly redundant in the light of DBG_ENTER above @@ -257,7 +255,6 @@ int wl_adapter_insert( struct net_device *dev ) int result = FALSE; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_adapter_insert" ); DBG_ENTER( DbgInfo ); DBG_TRACE( DbgInfo, "wl_adapter_insert() -- PCI\n" ); @@ -299,7 +296,6 @@ int wl_adapter_open( struct net_device *dev ) int hcf_status = HCF_SUCCESS; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_adapter_open" ); DBG_ENTER( DbgInfo ); DBG_TRACE( DbgInfo, "wl_adapter_open() -- PCI\n" ); @@ -334,7 +330,6 @@ int wl_adapter_open( struct net_device *dev ) ******************************************************************************/ int wl_adapter_close( struct net_device *dev ) { - DBG_FUNC( "wl_adapter_close" ); DBG_ENTER( DbgInfo ); DBG_TRACE( DbgInfo, "wl_adapter_close() -- PCI\n" ); @@ -403,7 +398,6 @@ int wl_pci_probe( struct pci_dev *pdev, int result; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_pci_probe" ); DBG_ENTER( DbgInfo ); DBG_PRINT( "%s\n", VERSION_INFO ); @@ -439,7 +433,6 @@ void wl_pci_remove(struct pci_dev *pdev) struct net_device *dev = NULL; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_pci_remove" ); DBG_ENTER( DbgInfo ); /* Make sure the pci_dev pointer passed in is valid */ @@ -494,7 +487,6 @@ int wl_pci_setup( struct pci_dev *pdev ) struct wl_private *lp = NULL; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_pci_setup" ); DBG_ENTER( DbgInfo ); /* Make sure the pci_dev pointer passed in is valid */ @@ -612,7 +604,6 @@ void wl_pci_enable_cardbus_interrupts( struct pci_dev *pdev ) void *mem_addr_kern = NULL; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_pci_enable_cardbus_interrupts" ); DBG_ENTER( DbgInfo ); /* Initialize to known bad values */ @@ -676,7 +667,6 @@ int wl_pci_dma_alloc( struct pci_dev *pdev, struct wl_private *lp ) int status = 0; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_pci_dma_alloc" ); DBG_ENTER( DbgInfo ); // lp->dma.tx_rsc_ind = lp->dma.rx_rsc_ind = 0; @@ -747,7 +737,6 @@ int wl_pci_dma_free( struct pci_dev *pdev, struct wl_private *lp ) int status = 0; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_pci_dma_free" ); DBG_ENTER( DbgInfo ); /* Reclaim all Rx packets that were handed over to the HCF */ @@ -1114,7 +1103,6 @@ int wl_pci_dma_alloc_desc( struct pci_dev *pdev, struct wl_private *lp, // dma_addr_t pa; // /*------------------------------------------------------------------------*/ // -// DBG_FUNC( "wl_pci_dma_alloc_desc" ); // DBG_ENTER( DbgInfo ); // // if( desc == NULL ) { @@ -1199,7 +1187,6 @@ int wl_pci_dma_alloc_buf( struct pci_dev *pdev, struct wl_private *lp, dma_addr_t pa; /*------------------------------------------------------------------------*/ -// DBG_FUNC( "wl_pci_dma_alloc_buf" ); // DBG_ENTER( DbgInfo ); // // if( desc == NULL ) { @@ -1297,7 +1284,6 @@ void wl_pci_dma_hcf_supply( struct wl_private *lp ) int i; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_pci_dma_hcf_supply" ); DBG_ENTER( DbgInfo ); //if( lp->dma.status == 0 ); @@ -1360,7 +1346,6 @@ void wl_pci_dma_hcf_reclaim( struct wl_private *lp ) int i; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_pci_dma_hcf_reclaim" ); DBG_ENTER( DbgInfo ); wl_pci_dma_hcf_reclaim_rx( lp ); @@ -1408,7 +1393,6 @@ void wl_pci_dma_hcf_reclaim_rx( struct wl_private *lp ) DESC_STRCT *p; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_pci_dma_hcf_reclaim_rx" ); DBG_ENTER( DbgInfo ); //if( lp->dma.status == 0 ) @@ -1539,7 +1523,6 @@ void wl_pci_dma_hcf_reclaim_tx( struct wl_private *lp ) DESC_STRCT *p; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_pci_dma_hcf_reclaim_tx" ); DBG_ENTER( DbgInfo ); //if( lp->dma.status == 0 ) diff --git a/drivers/staging/wlags49_h2/wl_priv.c b/drivers/staging/wlags49_h2/wl_priv.c index 7e10dcdc3090..f17d809cf1ae 100644 --- a/drivers/staging/wlags49_h2/wl_priv.c +++ b/drivers/staging/wlags49_h2/wl_priv.c @@ -132,7 +132,6 @@ int wvlan_uil(struct uilreq *urq, struct wl_private *lp) int ioctl_ret = 0; /*------------------------------------------------------------------------*/ - DBG_FUNC("wvlan_uil"); DBG_ENTER(DbgInfo); switch (urq->command) { @@ -198,7 +197,6 @@ int wvlan_uil_connect(struct uilreq *urq, struct wl_private *lp) /*------------------------------------------------------------------------*/ - DBG_FUNC("wvlan_uil_connect"); DBG_ENTER(DbgInfo); @@ -244,7 +242,6 @@ int wvlan_uil_disconnect(struct uilreq *urq, struct wl_private *lp) /*------------------------------------------------------------------------*/ - DBG_FUNC("wvlan_uil_disconnect"); DBG_ENTER(DbgInfo); @@ -300,7 +297,6 @@ int wvlan_uil_action(struct uilreq *urq, struct wl_private *lp) /*------------------------------------------------------------------------*/ - DBG_FUNC("wvlan_uil_action"); DBG_ENTER(DbgInfo); @@ -379,7 +375,6 @@ int wvlan_uil_block(struct uilreq *urq, struct wl_private *lp) /*------------------------------------------------------------------------*/ - DBG_FUNC("wvlan_uil_block"); DBG_ENTER(DbgInfo); if (urq->hcfCtx == &(lp->hcfCtx)) { @@ -431,7 +426,6 @@ int wvlan_uil_unblock(struct uilreq *urq, struct wl_private *lp) /*------------------------------------------------------------------------*/ - DBG_FUNC("wvlan_uil_unblock"); DBG_ENTER(DbgInfo); if (urq->hcfCtx == &(lp->hcfCtx)) { @@ -485,7 +479,6 @@ int wvlan_uil_send_diag_msg(struct uilreq *urq, struct wl_private *lp) /*------------------------------------------------------------------------*/ - DBG_FUNC("wvlan_uil_send_diag_msg"); DBG_ENTER(DbgInfo); if (urq->hcfCtx == &(lp->hcfCtx)) { @@ -576,7 +569,6 @@ int wvlan_uil_put_info(struct uilreq *urq, struct wl_private *lp) hcf_16 hcfPort = HCF_PORT_0; #endif /* USE_WDS */ /*------------------------------------------------------------------------*/ - DBG_FUNC("wvlan_uil_put_info"); DBG_ENTER(DbgInfo); @@ -1193,7 +1185,6 @@ int wvlan_uil_get_info(struct uilreq *urq, struct wl_private *lp) int i; /*------------------------------------------------------------------------*/ - DBG_FUNC("wvlan_uil_get_info"); DBG_ENTER(DbgInfo); if (urq->hcfCtx == &(lp->hcfCtx)) { @@ -1547,7 +1538,6 @@ int cfg_driver_info(struct uilreq *urq, struct wl_private *lp) /*------------------------------------------------------------------------*/ - DBG_FUNC("cfg_driver_info"); DBG_ENTER(DbgInfo); @@ -1606,7 +1596,6 @@ int cfg_driver_identity(struct uilreq *urq, struct wl_private *lp) /*------------------------------------------------------------------------*/ - DBG_FUNC("wvlan_driver_identity"); DBG_ENTER(DbgInfo); @@ -1675,7 +1664,6 @@ int wvlan_set_netname(struct net_device *dev, /*------------------------------------------------------------------------*/ - DBG_FUNC("wvlan_set_netname"); DBG_ENTER(DbgInfo); wl_lock(lp, &flags); @@ -1727,7 +1715,6 @@ int wvlan_get_netname(struct net_device *dev, /*------------------------------------------------------------------------*/ - DBG_FUNC("wvlan_get_netname"); DBG_ENTER(DbgInfo); wl_lock(lp, &flags); @@ -1790,7 +1777,6 @@ int wvlan_set_station_nickname(struct net_device *dev, /*------------------------------------------------------------------------*/ - DBG_FUNC("wvlan_set_station_nickname"); DBG_ENTER(DbgInfo); wl_lock(lp, &flags); @@ -1843,7 +1829,6 @@ int wvlan_get_station_nickname(struct net_device *dev, /*------------------------------------------------------------------------*/ - DBG_FUNC("wvlan_get_station_nickname"); DBG_ENTER(DbgInfo); wl_lock(lp, &flags); @@ -1906,7 +1891,6 @@ int wvlan_set_porttype(struct net_device *dev, /*------------------------------------------------------------------------*/ - DBG_FUNC("wvlan_set_porttype"); DBG_ENTER(DbgInfo); wl_lock(lp, &flags); @@ -1968,7 +1952,6 @@ int wvlan_get_porttype(struct net_device *dev, /*------------------------------------------------------------------------*/ - DBG_FUNC("wvlan_get_porttype"); DBG_ENTER(DbgInfo); wl_lock(lp, &flags); @@ -2026,7 +2009,6 @@ int wvlan_rts(struct rtsreq *rrq, __u32 io_base) /*------------------------------------------------------------------------*/ - DBG_FUNC("wvlan_rts"); DBG_ENTER(DbgInfo); diff --git a/drivers/staging/wlags49_h2/wl_profile.c b/drivers/staging/wlags49_h2/wl_profile.c index beabf5916df7..4622f3d0a4fd 100644 --- a/drivers/staging/wlags49_h2/wl_profile.c +++ b/drivers/staging/wlags49_h2/wl_profile.c @@ -165,7 +165,6 @@ void parse_config(struct net_device *dev) ENCSTRCT sEncryption; /*------------------------------------------------------------------------*/ - DBG_FUNC("parse_config"); DBG_ENTER(DbgInfo); /* Get the wavelan specific info for this device */ @@ -354,8 +353,6 @@ void translate_option(char *buffer, struct wl_private *lp) u_char mac_value[ETH_ALEN]; /*------------------------------------------------------------------------*/ - DBG_FUNC("translate_option"); - if (buffer == NULL || lp == NULL) { DBG_ERROR(DbgInfo, "Config file buffer and/or wavelan buffer ptr NULL\n"); return; @@ -961,7 +958,6 @@ void ParseConfigLine(char *pszLine, char **ppszLVal, char **ppszRVal) int size; /*------------------------------------------------------------------------*/ - DBG_FUNC("ParseConfigLine"); DBG_ENTER(DbgInfo); /* get a snapshot of our string size */ diff --git a/drivers/staging/wlags49_h2/wl_util.c b/drivers/staging/wlags49_h2/wl_util.c index 404ec7da0348..aeeab0156b7f 100644 --- a/drivers/staging/wlags49_h2/wl_util.c +++ b/drivers/staging/wlags49_h2/wl_util.c @@ -481,7 +481,6 @@ void wl_hcf_error( struct net_device *dev, int hcfStatus ) ******************************************************************************/ void wl_endian_translate_event( ltv_t *pLtv ) { - DBG_FUNC( "wl_endian_translate_event" ); DBG_ENTER( DbgInfo ); @@ -999,7 +998,6 @@ void wl_process_link_status( struct wl_private *lp ) hcf_16 link_stat; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_process_link_status" ); DBG_ENTER( DbgInfo ); if( lp != NULL ) { @@ -1061,7 +1059,6 @@ void wl_process_probe_response( struct wl_private *lp ) /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_process_probe_response" ); DBG_ENTER( DbgInfo ); @@ -1263,7 +1260,6 @@ void wl_process_probe_response( struct wl_private *lp ) ******************************************************************************/ void wl_process_updated_record( struct wl_private *lp ) { - DBG_FUNC( "wl_process_updated_record" ); DBG_ENTER( DbgInfo ); @@ -1318,7 +1314,6 @@ void wl_process_assoc_status( struct wl_private *lp ) /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_process_assoc_status" ); DBG_ENTER( DbgInfo ); @@ -1385,7 +1380,6 @@ void wl_process_security_status( struct wl_private *lp ) /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_process_security_status" ); DBG_ENTER( DbgInfo ); @@ -1438,7 +1432,6 @@ int wl_get_tallies(struct wl_private *lp, int status; CFG_HERMES_TALLIES_STRCT *pTallies; - DBG_FUNC( "wl_get_tallies" ); DBG_ENTER(DbgInfo); /* Get the current tallies from the adapter */ diff --git a/drivers/staging/wlags49_h2/wl_wext.c b/drivers/staging/wlags49_h2/wl_wext.c index c731ff2a6aa1..b991229671f3 100644 --- a/drivers/staging/wlags49_h2/wl_wext.c +++ b/drivers/staging/wlags49_h2/wl_wext.c @@ -329,7 +329,6 @@ static int wireless_commit(struct net_device *dev, int ret = 0; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wireless_commit" ); DBG_ENTER(DbgInfo); if(lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -376,7 +375,6 @@ out: ******************************************************************************/ static int wireless_get_protocol(struct net_device *dev, struct iw_request_info *info, char *name, char *extra) { - DBG_FUNC( "wireless_get_protocol" ); DBG_ENTER( DbgInfo ); /* Originally, the driver was placing the string "Wireless" here. However, @@ -420,8 +418,6 @@ static int wireless_set_frequency(struct net_device *dev, struct iw_request_info int ret = 0; /*------------------------------------------------------------------------*/ - - DBG_FUNC( "wireless_set_frequency" ); DBG_ENTER( DbgInfo ); if(lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -508,7 +504,6 @@ static int wireless_get_frequency(struct net_device *dev, struct iw_request_info /*------------------------------------------------------------------------*/ - DBG_FUNC( "wireless_get_frequency" ); DBG_ENTER( DbgInfo ); if(lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -579,7 +574,6 @@ static int wireless_get_range(struct net_device *dev, struct iw_request_info *in /*------------------------------------------------------------------------*/ - DBG_FUNC( "wireless_get_range" ); DBG_ENTER( DbgInfo ); /* Set range information */ @@ -784,7 +778,6 @@ static int wireless_get_bssid(struct net_device *dev, struct iw_request_info *in /*------------------------------------------------------------------------*/ - DBG_FUNC( "wireless_get_bssid" ); DBG_ENTER( DbgInfo ); if(lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -876,7 +869,6 @@ static int wireless_get_ap_list (struct net_device *dev, struct iw_request_info #endif // WARP /*------------------------------------------------------------------------*/ - DBG_FUNC( "wireless_get_ap_list" ); DBG_ENTER( DbgInfo ); if(lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -1013,7 +1005,6 @@ static int wireless_set_sensitivity(struct net_device *dev, struct iw_request_in /*------------------------------------------------------------------------*/ - DBG_FUNC( "wireless_set_sensitivity" ); DBG_ENTER( DbgInfo ); if(lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -1073,7 +1064,6 @@ static int wireless_get_sensitivity(struct net_device *dev, struct iw_request_in /*------------------------------------------------------------------------*/ - DBG_FUNC( "wireless_get_sensitivity" ); DBG_ENTER( DbgInfo ); if(lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -1119,7 +1109,6 @@ static int wireless_set_essid(struct net_device *dev, struct iw_request_info *in unsigned long flags; int ret = 0; - DBG_FUNC( "wireless_set_essid" ); DBG_ENTER( DbgInfo ); if(lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -1204,7 +1193,6 @@ static int wireless_get_essid(struct net_device *dev, struct iw_request_info *in /*------------------------------------------------------------------------*/ - DBG_FUNC( "wireless_get_essid" ); DBG_ENTER( DbgInfo ); if(lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -1394,7 +1382,6 @@ static int wireless_get_encode(struct net_device *dev, struct iw_request_info *i /*------------------------------------------------------------------------*/ - DBG_FUNC( "wireless_get_encode" ); DBG_ENTER( DbgInfo ); DBG_NOTICE(DbgInfo, "GIWENCODE: encrypt: %d, ID: %d\n", lp->EnableEncryption, lp->TransmitKeyID); @@ -1485,7 +1472,6 @@ static int wireless_set_nickname(struct net_device *dev, struct iw_request_info /*------------------------------------------------------------------------*/ - DBG_FUNC( "wireless_set_nickname" ); DBG_ENTER( DbgInfo ); if(lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -1560,7 +1546,6 @@ static int wireless_get_nickname(struct net_device *dev, struct iw_request_info /*------------------------------------------------------------------------*/ - DBG_FUNC( "wireless_get_nickname" ); DBG_ENTER( DbgInfo ); if(lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -1636,7 +1621,6 @@ static int wireless_set_porttype(struct net_device *dev, struct iw_request_info hcf_16 createIBSS; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wireless_set_porttype" ); DBG_ENTER( DbgInfo ); if(lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -1752,7 +1736,6 @@ static int wireless_get_porttype(struct net_device *dev, struct iw_request_info /*------------------------------------------------------------------------*/ - DBG_FUNC( "wireless_get_porttype" ); DBG_ENTER( DbgInfo ); if(lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -1859,7 +1842,6 @@ static int wireless_set_power(struct net_device *dev, struct iw_request_info *in /*------------------------------------------------------------------------*/ - DBG_FUNC( "wireless_set_power" ); DBG_ENTER( DbgInfo ); if(lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -1931,7 +1913,6 @@ static int wireless_get_power(struct net_device *dev, struct iw_request_info *in unsigned long flags; int ret = 0; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wireless_get_power" ); DBG_ENTER( DbgInfo ); if(lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -1992,7 +1973,6 @@ static int wireless_get_tx_power(struct net_device *dev, struct iw_request_info unsigned long flags; int ret = 0; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wireless_get_tx_power" ); DBG_ENTER( DbgInfo ); if(lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -2055,7 +2035,6 @@ static int wireless_set_rts_threshold (struct net_device *dev, struct iw_request /*------------------------------------------------------------------------*/ - DBG_FUNC( "wireless_set_rts_threshold" ); DBG_ENTER( DbgInfo ); if(lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -2124,7 +2103,6 @@ static int wireless_get_rts_threshold (struct net_device *dev, struct iw_request unsigned long flags; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wireless_get_rts_threshold" ); DBG_ENTER( DbgInfo ); if(lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -2187,7 +2165,6 @@ static int wireless_set_rate(struct net_device *dev, struct iw_request_info *inf /*------------------------------------------------------------------------*/ - DBG_FUNC( "wireless_set_rate" ); DBG_ENTER( DbgInfo ); if(lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -2413,7 +2390,6 @@ static int wireless_get_rate(struct net_device *dev, struct iw_request_info *inf /*------------------------------------------------------------------------*/ - DBG_FUNC( "wireless_get_rate" ); DBG_ENTER( DbgInfo ); if(lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -2525,7 +2501,6 @@ int wireless_get_private_interface( struct iwreq *wrq, struct wl_private *lp ) /*------------------------------------------------------------------------*/ - DBG_FUNC( "wireless_get_private_interface" ); DBG_ENTER( DbgInfo ); if(lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -2596,7 +2571,6 @@ static int wireless_set_scan(struct net_device *dev, struct iw_request_info *inf //;? Note: shows results as trace, returns always 0 unless BUSY - DBG_FUNC( "wireless_set_scan" ); DBG_ENTER( DbgInfo ); if(lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -2737,7 +2711,6 @@ static int wireless_get_scan(struct net_device *dev, struct iw_request_info *inf /*------------------------------------------------------------------------*/ - DBG_FUNC( "wireless_get_scan" ); DBG_ENTER( DbgInfo ); if(lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -2923,7 +2896,6 @@ static int wireless_set_auth(struct net_device *dev, int iwa_idx = data->flags & IW_AUTH_INDEX; int iwa_val = data->value; - DBG_FUNC( "wireless_set_auth" ); DBG_ENTER( DbgInfo ); if (lp->portState == WVLAN_PORT_STATE_DISABLED) { @@ -3240,7 +3212,6 @@ struct iw_statistics * wl_wireless_stats( struct net_device *dev ) /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_wireless_stats" ); DBG_ENTER(DbgInfo); DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev); @@ -3338,7 +3309,6 @@ struct iw_statistics * wl_get_wireless_stats( struct net_device *dev ) struct iw_statistics *pStats = NULL; /*------------------------------------------------------------------------*/ - DBG_FUNC( "wl_get_wireless_stats" ); DBG_ENTER(DbgInfo); wl_lock( lp, &flags );