From d599edcaea987e233fad808f88850f725e8a5530 Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Wed, 7 Jan 2009 14:31:57 -0800 Subject: staging: __FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison Signed-off-by: Linus Torvalds --- drivers/staging/rtl8187se/ieee80211.h | 2 +- drivers/staging/rtl8187se/ieee80211/ieee80211.h | 2 +- drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 2 +- drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 2 +- drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c | 2 +- drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 2 +- drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c | 8 ++++---- drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c | 2 +- drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 8 ++++---- drivers/staging/rtl8187se/r8180_core.c | 12 ++++++------ drivers/staging/rtl8187se/r8180_rtl8225z2.c | 4 ++-- drivers/staging/rtl8187se/r8180_wx.c | 14 +++++++------- 12 files changed, 30 insertions(+), 30 deletions(-) (limited to 'drivers/staging/rtl8187se') diff --git a/drivers/staging/rtl8187se/ieee80211.h b/drivers/staging/rtl8187se/ieee80211.h index bf06abeeaeb8..58336080ad50 100644 --- a/drivers/staging/rtl8187se/ieee80211.h +++ b/drivers/staging/rtl8187se/ieee80211.h @@ -396,7 +396,7 @@ extern u32 ieee80211_debug_level; #define IEEE80211_DEBUG(level, fmt, args...) \ do { if (ieee80211_debug_level & (level)) \ printk(KERN_DEBUG "ieee80211: %c %s " fmt, \ - in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0) + in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0) #else #define IEEE80211_DEBUG(level, fmt, args...) do {} while (0) #endif /* CONFIG_IEEE80211_DEBUG */ diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211.h b/drivers/staging/rtl8187se/ieee80211/ieee80211.h index bf06abeeaeb8..58336080ad50 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211.h @@ -396,7 +396,7 @@ extern u32 ieee80211_debug_level; #define IEEE80211_DEBUG(level, fmt, args...) \ do { if (ieee80211_debug_level & (level)) \ printk(KERN_DEBUG "ieee80211: %c %s " fmt, \ - in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0) + in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0) #else #define IEEE80211_DEBUG(level, fmt, args...) do {} while (0) #endif /* CONFIG_IEEE80211_DEBUG */ diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c index 7d890c328b0e..08add385790f 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c @@ -490,7 +490,7 @@ static char * ieee80211_ccmp_print_stats(char *p, void *priv) void ieee80211_ccmp_null(void) { -// printk("============>%s()\n", __FUNCTION__); +// printk("============>%s()\n", __func__); return; } static struct ieee80211_crypto_ops ieee80211_crypt_ccmp = { diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c index e560b1e11020..de97bbec0da5 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c @@ -984,7 +984,7 @@ void ieee80211_crypto_tkip_exit(void) void ieee80211_tkip_null(void) { -// printk("============>%s()\n", __FUNCTION__); +// printk("============>%s()\n", __func__); return; } diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c index f973daeeeb0f..68a22b32fcf0 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c @@ -380,7 +380,7 @@ void ieee80211_crypto_wep_exit(void) void ieee80211_wep_null(void) { -// printk("============>%s()\n", __FUNCTION__); +// printk("============>%s()\n", __func__); return; } #if 0 diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c index 79ec64959cf6..23519b37538f 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c @@ -1635,7 +1635,7 @@ inline void update_network(struct ieee80211_network *dst, memcpy(dst->rates_ex, src->rates_ex, src->rates_ex_len); dst->rates_ex_len = src->rates_ex_len; dst->HighestOperaRate= src->HighestOperaRate; - //printk("==========>in %s: src->ssid is %s,chan is %d\n",__FUNCTION__,src->ssid,src->channel); + //printk("==========>in %s: src->ssid is %s,chan is %d\n",__func__,src->ssid,src->channel); //YJ,add,080819,for hidden ap if(src->ssid_len > 0) diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c index fcffee516d51..e5752f615e09 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c @@ -731,7 +731,7 @@ void ieee80211_softmac_scan_wq(struct ieee80211_device *ieee) memcpy(channel_map, GET_DOT11D_INFO(ieee)->channel_map, MAX_CHANNEL_NUMBER+1); #endif // printk("ieee80211_softmac_scan_wq ENABLE_IPS\n"); -// printk("in %s\n",__FUNCTION__); +// printk("in %s\n",__func__); down(&ieee->scan_sem); do{ @@ -1785,7 +1785,7 @@ void ieee80211_associate_step1(struct ieee80211_device *ieee) //If call dev_kfree_skb_any,a warning will ocur.... //KERNEL: assertion (!atomic_read(&skb->users)) failed at net/core/dev.c (1708) //So ... 1204 by lawrence. - //printk("\nIn %s,line %d call kfree skb.",__FUNCTION__,__LINE__); + //printk("\nIn %s,line %d call kfree skb.",__func__,__LINE__); //dev_kfree_skb_any(skb);//edit by thomas } } @@ -2432,7 +2432,7 @@ inline void ieee80211_sta_ps(struct ieee80211_device *ieee) } sleep = ieee80211_sta_ps_sleep(ieee,&th, &tl); -// printk("===>%s,%d[2 wake, 1 sleep, 0 do nothing], ieee->sta_sleep = %d\n",__FUNCTION__, sleep,ieee->sta_sleep); +// printk("===>%s,%d[2 wake, 1 sleep, 0 do nothing], ieee->sta_sleep = %d\n",__func__, sleep,ieee->sta_sleep); /* 2 wake, 1 sleep, 0 do nothing */ if(sleep == 0) goto out; @@ -2510,7 +2510,7 @@ void ieee80211_ps_tx_ack(struct ieee80211_device *ieee, short success) /* Null frame with PS bit set */ if(success){ - // printk("==================> %s::enter sleep state\n",__FUNCTION__); + // printk("==================> %s::enter sleep state\n",__func__); ieee->sta_sleep = 1; ieee->enter_sleep_state(ieee->dev,ieee->ps_th,ieee->ps_tl); } diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c index 43b8aecee9de..93af37e2d31a 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c @@ -31,7 +31,7 @@ int ieee80211_wx_set_freq(struct ieee80211_device *ieee, struct iw_request_info { int ret; struct iw_freq *fwrq = & wrqu->freq; -// printk("in %s\n",__FUNCTION__); +// printk("in %s\n",__func__); down(&ieee->wx_sem); if(ieee->iw_mode == IW_MODE_INFRA){ diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c index c7d9f4fda413..6aad61e78041 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c @@ -663,7 +663,7 @@ int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee, ret = -EINVAL; goto done; } -// printk("8-09-08-9=====>%s, alg name:%s\n",__FUNCTION__, alg); +// printk("8-09-08-9=====>%s, alg name:%s\n",__func__, alg); ops = ieee80211_get_crypto_ops(alg); if (ops == NULL) { @@ -757,7 +757,7 @@ int ieee80211_wx_set_mlme(struct ieee80211_device *ieee, union iwreq_data *wrqu, char *extra) { struct iw_mlme *mlme = (struct iw_mlme *) extra; -// printk("\ndkgadfslkdjgalskdf===============>%s(), cmd:%x\n", __FUNCTION__, mlme->cmd); +// printk("\ndkgadfslkdjgalskdf===============>%s(), cmd:%x\n", __func__, mlme->cmd); #if 1 switch (mlme->cmd) { case IW_MLME_DEAUTH: @@ -830,7 +830,7 @@ int ieee80211_wx_set_auth(struct ieee80211_device *ieee, int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len) { #if 0 - printk("====>%s()\n", __FUNCTION__); + printk("====>%s()\n", __func__); { int i; for (i=0; iwpa_ie = NULL; ieee->wpa_ie_len = 0; } -// printk("<=====out %s()\n", __FUNCTION__); +// printk("<=====out %s()\n", __func__); return 0; diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c index 00f4df49bc0e..94534955e38b 100644 --- a/drivers/staging/rtl8187se/r8180_core.c +++ b/drivers/staging/rtl8187se/r8180_core.c @@ -1407,12 +1407,12 @@ void rtl8180_set_chan(struct net_device *dev,short ch) if((ch > 14) || (ch < 1)) { - printk("In %s: Invalid chnanel %d\n", __FUNCTION__, ch); + printk("In %s: Invalid chnanel %d\n", __func__, ch); return; } priv->chan=ch; - //printk("in %s:channel is %d\n",__FUNCTION__,ch); + //printk("in %s:channel is %d\n",__func__,ch); priv->rf_set_chan(dev,priv->chan); } @@ -3656,7 +3656,7 @@ void rtl8180_link_change(struct net_device *dev) void rtl8180_rq_tx_ack(struct net_device *dev){ struct r8180_priv *priv = ieee80211_priv(dev); -// printk("====================>%s\n",__FUNCTION__); +// printk("====================>%s\n",__func__); write_nic_byte(dev,CONFIG4,read_nic_byte(dev,CONFIG4)|CONFIG4_PWRMGT); priv->ack_tx_to_ieee = 1; } @@ -5448,7 +5448,7 @@ void rtl8180_hw_wakeup_wq(struct net_device *dev) #endif // printk("dev is %d\n",dev); -// printk("&*&(^*(&(&=========>%s()\n", __FUNCTION__); +// printk("&*&(^*(&(&=========>%s()\n", __func__); rtl8180_hw_wakeup(dev); } @@ -6318,12 +6318,12 @@ priv->txnpring)/8); // printk("NumTxOkTotal is %d\n",priv->NumTxOkTotal++); } #endif - // printk("in function %s:curr_retry_count is %d\n",__FUNCTION__,((*head) & (0x000000ff))); + // printk("in function %s:curr_retry_count is %d\n",__func__,((*head) & (0x000000ff))); } if(!error){ priv->NumTxOkBytesTotal += (*(head+3)) & (0x00000fff); } -// printk("in function %s:curr_txokbyte_count is %d\n",__FUNCTION__,(*(head+3)) & (0x00000fff)); +// printk("in function %s:curr_txokbyte_count is %d\n",__func__,(*(head+3)) & (0x00000fff)); *head = *head &~ (1<<31); if((head - begin)/8 == priv->txringcount-1) diff --git a/drivers/staging/rtl8187se/r8180_rtl8225z2.c b/drivers/staging/rtl8187se/r8180_rtl8225z2.c index 90a574d46da0..4136b9429597 100644 --- a/drivers/staging/rtl8187se/r8180_rtl8225z2.c +++ b/drivers/staging/rtl8187se/r8180_rtl8225z2.c @@ -1571,7 +1571,7 @@ void rtl8225z4_rf_sleep(struct net_device *dev) // // Turn off RF power. // - //printk("=========>%s()\n", __FUNCTION__); + //printk("=========>%s()\n", __func__); MgntActSet_RF_State(dev, eRfSleep, RF_CHANGE_BY_PS); //mdelay(2); //FIXME } @@ -1580,7 +1580,7 @@ void rtl8225z4_rf_wakeup(struct net_device *dev) // // Turn on RF power. // - //printk("=========>%s()\n", __FUNCTION__); + //printk("=========>%s()\n", __func__); MgntActSet_RF_State(dev, eRfOn, RF_CHANGE_BY_PS); } #endif diff --git a/drivers/staging/rtl8187se/r8180_wx.c b/drivers/staging/rtl8187se/r8180_wx.c index c77abe502b79..8b3901d87f87 100644 --- a/drivers/staging/rtl8187se/r8180_wx.c +++ b/drivers/staging/rtl8187se/r8180_wx.c @@ -1177,7 +1177,7 @@ static int r8180_wx_set_channelplan(struct net_device *dev, //struct ieee80211_device *ieee = netdev_priv(dev); int *val = (int *)extra; int i; - printk("-----in fun %s\n", __FUNCTION__); + printk("-----in fun %s\n", __func__); if(priv->ieee80211->bHwRadioOff) return 0; @@ -1235,7 +1235,7 @@ static int r8180_wx_set_forcerate(struct net_device *dev, down(&priv->wx_sem); - printk("==============>%s(): forcerate is %d\n",__FUNCTION__,forcerate); + printk("==============>%s(): forcerate is %d\n",__func__,forcerate); if((forcerate == 2) || (forcerate == 4) || (forcerate == 11) || (forcerate == 22) || (forcerate == 12) || (forcerate == 18) || (forcerate == 24) || (forcerate == 36) || (forcerate == 48) || (forcerate == 72) || (forcerate == 96) || (forcerate == 108)) @@ -1260,7 +1260,7 @@ static int r8180_wx_set_enc_ext(struct net_device *dev, { struct r8180_priv *priv = ieee80211_priv(dev); - //printk("===>%s()\n", __FUNCTION__); + //printk("===>%s()\n", __func__); int ret=0; @@ -1277,7 +1277,7 @@ static int r8180_wx_set_auth(struct net_device *dev, struct iw_request_info *info, struct iw_param *data, char *extra) { - //printk("====>%s()\n", __FUNCTION__); + //printk("====>%s()\n", __func__); struct r8180_priv *priv = ieee80211_priv(dev); int ret=0; @@ -1294,7 +1294,7 @@ static int r8180_wx_set_mlme(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - //printk("====>%s()\n", __FUNCTION__); + //printk("====>%s()\n", __func__); int ret=0; struct r8180_priv *priv = ieee80211_priv(dev); @@ -1315,7 +1315,7 @@ static int r8180_wx_set_gen_ie(struct net_device *dev, struct iw_request_info *info, struct iw_point *data, char *extra) { -// printk("====>%s(), len:%d\n", __FUNCTION__, data->length); +// printk("====>%s(), len:%d\n", __func__, data->length); int ret=0; struct r8180_priv *priv = ieee80211_priv(dev); @@ -1328,7 +1328,7 @@ static int r8180_wx_set_gen_ie(struct net_device *dev, ret = ieee80211_wx_set_gen_ie(priv->ieee80211, extra, data->length); #endif up(&priv->wx_sem); - //printk("<======%s(), ret:%d\n", __FUNCTION__, ret); + //printk("<======%s(), ret:%d\n", __func__, ret); return ret; -- cgit v1.2.3-59-g8ed1b