Commit c94c93da authored by Harvey Harrison's avatar Harvey Harrison Committed by John W. Linville

wireless: replace __FUNCTION__ with __func__

__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d9c63504
...@@ -1915,7 +1915,7 @@ static int mpi_start_xmit(struct sk_buff *skb, struct net_device *dev) { ...@@ -1915,7 +1915,7 @@ static int mpi_start_xmit(struct sk_buff *skb, struct net_device *dev) {
struct airo_info *ai = dev->priv; struct airo_info *ai = dev->priv;
if (!skb) { if (!skb) {
airo_print_err(dev->name, "%s: skb == NULL!",__FUNCTION__); airo_print_err(dev->name, "%s: skb == NULL!",__func__);
return 0; return 0;
} }
npacks = skb_queue_len (&ai->txq); npacks = skb_queue_len (&ai->txq);
...@@ -1964,7 +1964,7 @@ static int mpi_send_packet (struct net_device *dev) ...@@ -1964,7 +1964,7 @@ static int mpi_send_packet (struct net_device *dev)
if ((skb = skb_dequeue(&ai->txq)) == NULL) { if ((skb = skb_dequeue(&ai->txq)) == NULL) {
airo_print_err(dev->name, airo_print_err(dev->name,
"%s: Dequeue'd zero in send_packet()", "%s: Dequeue'd zero in send_packet()",
__FUNCTION__); __func__);
return 0; return 0;
} }
...@@ -2115,7 +2115,7 @@ static int airo_start_xmit(struct sk_buff *skb, struct net_device *dev) { ...@@ -2115,7 +2115,7 @@ static int airo_start_xmit(struct sk_buff *skb, struct net_device *dev) {
u32 *fids = priv->fids; u32 *fids = priv->fids;
if ( skb == NULL ) { if ( skb == NULL ) {
airo_print_err(dev->name, "%s: skb == NULL!", __FUNCTION__); airo_print_err(dev->name, "%s: skb == NULL!", __func__);
return 0; return 0;
} }
...@@ -2186,7 +2186,7 @@ static int airo_start_xmit11(struct sk_buff *skb, struct net_device *dev) { ...@@ -2186,7 +2186,7 @@ static int airo_start_xmit11(struct sk_buff *skb, struct net_device *dev) {
} }
if ( skb == NULL ) { if ( skb == NULL ) {
airo_print_err(dev->name, "%s: skb == NULL!", __FUNCTION__); airo_print_err(dev->name, "%s: skb == NULL!", __func__);
return 0; return 0;
} }
...@@ -4127,7 +4127,7 @@ static int PC4500_writerid(struct airo_info *ai, u16 rid, ...@@ -4127,7 +4127,7 @@ static int PC4500_writerid(struct airo_info *ai, u16 rid,
if (test_bit(FLAG_ENABLED, &ai->flags) && (RID_WEP_TEMP != rid)) if (test_bit(FLAG_ENABLED, &ai->flags) && (RID_WEP_TEMP != rid))
airo_print_err(ai->dev->name, airo_print_err(ai->dev->name,
"%s: MAC should be disabled (rid=%04x)", "%s: MAC should be disabled (rid=%04x)",
__FUNCTION__, rid); __func__, rid);
memset(&cmd, 0, sizeof(cmd)); memset(&cmd, 0, sizeof(cmd));
memset(&rsp, 0, sizeof(rsp)); memset(&rsp, 0, sizeof(rsp));
...@@ -4142,7 +4142,7 @@ static int PC4500_writerid(struct airo_info *ai, u16 rid, ...@@ -4142,7 +4142,7 @@ static int PC4500_writerid(struct airo_info *ai, u16 rid,
&ai->config_desc.rid_desc, sizeof(Rid)); &ai->config_desc.rid_desc, sizeof(Rid));
if (len < 4 || len > 2047) { if (len < 4 || len > 2047) {
airo_print_err(ai->dev->name, "%s: len=%d", __FUNCTION__, len); airo_print_err(ai->dev->name, "%s: len=%d", __func__, len);
rc = -1; rc = -1;
} else { } else {
memcpy((char *)ai->config_desc.virtual_host_addr, memcpy((char *)ai->config_desc.virtual_host_addr,
...@@ -4151,9 +4151,9 @@ static int PC4500_writerid(struct airo_info *ai, u16 rid, ...@@ -4151,9 +4151,9 @@ static int PC4500_writerid(struct airo_info *ai, u16 rid,
rc = issuecommand(ai, &cmd, &rsp); rc = issuecommand(ai, &cmd, &rsp);
if ((rc & 0xff00) != 0) { if ((rc & 0xff00) != 0) {
airo_print_err(ai->dev->name, "%s: Write rid Error %d", airo_print_err(ai->dev->name, "%s: Write rid Error %d",
__FUNCTION__, rc); __func__, rc);
airo_print_err(ai->dev->name, "%s: Cmd=%04x", airo_print_err(ai->dev->name, "%s: Cmd=%04x",
__FUNCTION__, cmd.cmd); __func__, cmd.cmd);
} }
if ((rsp.status & 0x7f00)) if ((rsp.status & 0x7f00))
......
...@@ -463,7 +463,7 @@ int hermes_read_ltv(hermes_t *hw, int bap, u16 rid, unsigned bufsize, ...@@ -463,7 +463,7 @@ int hermes_read_ltv(hermes_t *hw, int bap, u16 rid, unsigned bufsize,
if (rtype != rid) if (rtype != rid)
printk(KERN_WARNING "hermes @ %p: %s(): " printk(KERN_WARNING "hermes @ %p: %s(): "
"rid (0x%04x) does not match type (0x%04x)\n", "rid (0x%04x) does not match type (0x%04x)\n",
hw->iobase, __FUNCTION__, rid, rtype); hw->iobase, __func__, rid, rtype);
if (HERMES_RECLEN_TO_BYTES(rlength) > bufsize) if (HERMES_RECLEN_TO_BYTES(rlength) > bufsize)
printk(KERN_WARNING "hermes @ %p: " printk(KERN_WARNING "hermes @ %p: "
"Truncating LTV record from %d to %d bytes. " "Truncating LTV record from %d to %d bytes. "
......
...@@ -211,7 +211,7 @@ static u32 ipw2100_debug_level = IPW_DL_NONE; ...@@ -211,7 +211,7 @@ static u32 ipw2100_debug_level = IPW_DL_NONE;
do { \ do { \
if (ipw2100_debug_level & (level)) { \ if (ipw2100_debug_level & (level)) { \
printk(KERN_DEBUG "ipw2100: %c %s ", \ printk(KERN_DEBUG "ipw2100: %c %s ", \
in_interrupt() ? 'I' : 'U', __FUNCTION__); \ in_interrupt() ? 'I' : 'U', __func__); \
printk(message); \ printk(message); \
} \ } \
} while (0) } while (0)
......
...@@ -1394,13 +1394,13 @@ BIT_ARG16(x) ...@@ -1394,13 +1394,13 @@ BIT_ARG16(x)
#define IPW_DEBUG(level, fmt, args...) \ #define IPW_DEBUG(level, fmt, args...) \
do { if (ipw_debug_level & (level)) \ do { if (ipw_debug_level & (level)) \
printk(KERN_DEBUG DRV_NAME": %c %s " fmt, \ printk(KERN_DEBUG DRV_NAME": %c %s " fmt, \
in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0) in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0)
#ifdef CONFIG_IPW2200_DEBUG #ifdef CONFIG_IPW2200_DEBUG
#define IPW_LL_DEBUG(level, fmt, args...) \ #define IPW_LL_DEBUG(level, fmt, args...) \
do { if (ipw_debug_level & (level)) \ do { if (ipw_debug_level & (level)) \
printk(KERN_DEBUG DRV_NAME": %c %s " fmt, \ printk(KERN_DEBUG DRV_NAME": %c %s " fmt, \
in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0) in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0)
#else #else
#define IPW_LL_DEBUG(level, fmt, args...) do {} while (0) #define IPW_LL_DEBUG(level, fmt, args...) do {} while (0)
#endif /* CONFIG_IPW2200_DEBUG */ #endif /* CONFIG_IPW2200_DEBUG */
......
...@@ -34,12 +34,12 @@ extern u32 iwl3945_debug_level; ...@@ -34,12 +34,12 @@ extern u32 iwl3945_debug_level;
#define IWL_DEBUG(level, fmt, args...) \ #define IWL_DEBUG(level, fmt, args...) \
do { if (iwl3945_debug_level & (level)) \ do { if (iwl3945_debug_level & (level)) \
printk(KERN_ERR DRV_NAME": %c %s " fmt, \ printk(KERN_ERR DRV_NAME": %c %s " fmt, \
in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0) in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0)
#define IWL_DEBUG_LIMIT(level, fmt, args...) \ #define IWL_DEBUG_LIMIT(level, fmt, args...) \
do { if ((iwl3945_debug_level & (level)) && net_ratelimit()) \ do { if ((iwl3945_debug_level & (level)) && net_ratelimit()) \
printk(KERN_ERR DRV_NAME": %c %s " fmt, \ printk(KERN_ERR DRV_NAME": %c %s " fmt, \
in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0) in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0)
static inline void iwl3945_print_hex_dump(int level, void *p, u32 len) static inline void iwl3945_print_hex_dump(int level, void *p, u32 len)
{ {
......
...@@ -720,7 +720,7 @@ static int if_cs_host_to_card(struct lbs_private *priv, ...@@ -720,7 +720,7 @@ static int if_cs_host_to_card(struct lbs_private *priv,
ret = if_cs_send_cmd(priv, buf, nb); ret = if_cs_send_cmd(priv, buf, nb);
break; break;
default: default:
lbs_pr_err("%s: unsupported type %d\n", __FUNCTION__, type); lbs_pr_err("%s: unsupported type %d\n", __func__, type);
} }
lbs_deb_leave_args(LBS_DEB_CS, "ret %d", ret); lbs_deb_leave_args(LBS_DEB_CS, "ret %d", ret);
......
...@@ -71,7 +71,7 @@ prism54_mib_mode_helper(islpci_private *priv, u32 iw_mode) ...@@ -71,7 +71,7 @@ prism54_mib_mode_helper(islpci_private *priv, u32 iw_mode)
if (iw_mode == IW_MODE_REPEAT || iw_mode == IW_MODE_SECOND) { if (iw_mode == IW_MODE_REPEAT || iw_mode == IW_MODE_SECOND) {
printk(KERN_DEBUG printk(KERN_DEBUG
"%s(): Sorry, Repeater mode and Secondary mode " "%s(): Sorry, Repeater mode and Secondary mode "
"are not yet supported by this driver.\n", __FUNCTION__); "are not yet supported by this driver.\n", __func__);
return -EINVAL; return -EINVAL;
} }
...@@ -333,7 +333,7 @@ prism54_set_mode(struct net_device *ndev, struct iw_request_info *info, ...@@ -333,7 +333,7 @@ prism54_set_mode(struct net_device *ndev, struct iw_request_info *info,
if (*uwrq > IW_MODE_MONITOR || *uwrq < IW_MODE_AUTO) { if (*uwrq > IW_MODE_MONITOR || *uwrq < IW_MODE_AUTO) {
printk(KERN_DEBUG printk(KERN_DEBUG
"%s: %s() You passed a non-valid init_mode.\n", "%s: %s() You passed a non-valid init_mode.\n",
priv->ndev->name, __FUNCTION__); priv->ndev->name, __func__);
return -EINVAL; return -EINVAL;
} }
...@@ -1234,7 +1234,7 @@ prism54_set_txpower(struct net_device *ndev, struct iw_request_info *info, ...@@ -1234,7 +1234,7 @@ prism54_set_txpower(struct net_device *ndev, struct iw_request_info *info,
/* don't know how to disable radio */ /* don't know how to disable radio */
printk(KERN_DEBUG printk(KERN_DEBUG
"%s: %s() disabling radio is not yet supported.\n", "%s: %s() disabling radio is not yet supported.\n",
priv->ndev->name, __FUNCTION__); priv->ndev->name, __func__);
return -ENOTSUPP; return -ENOTSUPP;
} else if (vwrq->fixed) } else if (vwrq->fixed)
/* currently only fixed value is supported */ /* currently only fixed value is supported */
...@@ -1242,7 +1242,7 @@ prism54_set_txpower(struct net_device *ndev, struct iw_request_info *info, ...@@ -1242,7 +1242,7 @@ prism54_set_txpower(struct net_device *ndev, struct iw_request_info *info,
else { else {
printk(KERN_DEBUG printk(KERN_DEBUG
"%s: %s() auto power will be implemented later.\n", "%s: %s() auto power will be implemented later.\n",
priv->ndev->name, __FUNCTION__); priv->ndev->name, __func__);
return -ENOTSUPP; return -ENOTSUPP;
} }
} }
......
...@@ -53,11 +53,11 @@ ...@@ -53,11 +53,11 @@
*/ */
#define DEBUG_PRINTK_MSG(__dev, __kernlvl, __lvl, __msg, __args...) \ #define DEBUG_PRINTK_MSG(__dev, __kernlvl, __lvl, __msg, __args...) \
printk(__kernlvl "%s -> %s: %s - " __msg, \ printk(__kernlvl "%s -> %s: %s - " __msg, \
wiphy_name((__dev)->hw->wiphy), __FUNCTION__, __lvl, ##__args) wiphy_name((__dev)->hw->wiphy), __func__, __lvl, ##__args)
#define DEBUG_PRINTK_PROBE(__kernlvl, __lvl, __msg, __args...) \ #define DEBUG_PRINTK_PROBE(__kernlvl, __lvl, __msg, __args...) \
printk(__kernlvl "%s -> %s: %s - " __msg, \ printk(__kernlvl "%s -> %s: %s - " __msg, \
KBUILD_MODNAME, __FUNCTION__, __lvl, ##__args) KBUILD_MODNAME, __func__, __lvl, ##__args)
#ifdef CONFIG_RT2X00_DEBUG #ifdef CONFIG_RT2X00_DEBUG
#define DEBUG_PRINTK(__dev, __kernlvl, __lvl, __msg, __args...) \ #define DEBUG_PRINTK(__dev, __kernlvl, __lvl, __msg, __args...) \
......
...@@ -79,7 +79,7 @@ static int pc_debug = PCMCIA_DEBUG; ...@@ -79,7 +79,7 @@ static int pc_debug = PCMCIA_DEBUG;
module_param(pc_debug, int, 0); module_param(pc_debug, int, 0);
#define dprintk(n, format, args...) \ #define dprintk(n, format, args...) \
{ if (pc_debug > (n)) \ { if (pc_debug > (n)) \
printk(KERN_INFO "%s: " format "\n", __FUNCTION__ , ##args); } printk(KERN_INFO "%s: " format "\n", __func__ , ##args); }
#else #else
#define dprintk(n, format, args...) #define dprintk(n, format, args...)
#endif #endif
...@@ -470,7 +470,7 @@ static int wl3501_pwr_mgmt(struct wl3501_card *this, int suspend) ...@@ -470,7 +470,7 @@ static int wl3501_pwr_mgmt(struct wl3501_card *this, int suspend)
spin_unlock_irqrestore(&this->lock, flags); spin_unlock_irqrestore(&this->lock, flags);
rc = wait_event_interruptible(this->wait, rc = wait_event_interruptible(this->wait,
this->sig_pwr_mgmt_confirm.status != 255); this->sig_pwr_mgmt_confirm.status != 255);
printk(KERN_INFO "%s: %s status=%d\n", __FUNCTION__, printk(KERN_INFO "%s: %s status=%d\n", __func__,
suspend ? "suspend" : "resume", suspend ? "suspend" : "resume",
this->sig_pwr_mgmt_confirm.status); this->sig_pwr_mgmt_confirm.status);
goto out; goto out;
...@@ -1199,7 +1199,7 @@ static int wl3501_reset_board(struct wl3501_card *this) ...@@ -1199,7 +1199,7 @@ static int wl3501_reset_board(struct wl3501_card *this)
} }
WL3501_NOPLOOP(10); WL3501_NOPLOOP(10);
} }
printk(KERN_WARNING "%s: failed to reset the board!\n", __FUNCTION__); printk(KERN_WARNING "%s: failed to reset the board!\n", __func__);
rc = -ENODEV; rc = -ENODEV;
out: out:
return rc; return rc;
...@@ -1250,7 +1250,7 @@ static int wl3501_init_firmware(struct wl3501_card *this) ...@@ -1250,7 +1250,7 @@ static int wl3501_init_firmware(struct wl3501_card *this)
out: out:
return rc; return rc;
fail: fail:
printk(KERN_WARNING "%s: failed!\n", __FUNCTION__); printk(KERN_WARNING "%s: failed!\n", __func__);
goto out; goto out;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment