Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/wireless/airo.c

+8 −8
Original line number Diff line number Diff line
@@ -1915,7 +1915,7 @@ static int mpi_start_xmit(struct sk_buff *skb, struct net_device *dev) { 
	struct airo_info *ai = dev->priv;



	if (!skb) {

		airo_print_err(dev->name, "%s: skb == NULL!",__FUNCTION__);

		airo_print_err(dev->name, "%s: skb == NULL!",__func__);

		return 0;

	}

	npacks = skb_queue_len (&ai->txq);
@@ -1964,7 +1964,7 @@ static int mpi_send_packet (struct net_device *dev) 
	if ((skb = skb_dequeue(&ai->txq)) == NULL) {

		airo_print_err(dev->name,

			"%s: Dequeue'd zero in send_packet()",

			__FUNCTION__);

			__func__);

		return 0;

	}
@@ -2115,7 +2115,7 @@ static int airo_start_xmit(struct sk_buff *skb, struct net_device *dev) { 
	u32 *fids = priv->fids;



	if ( skb == NULL ) {

		airo_print_err(dev->name, "%s: skb == NULL!", __FUNCTION__);

		airo_print_err(dev->name, "%s: skb == NULL!", __func__);

		return 0;

	}
@@ -2186,7 +2186,7 @@ static int airo_start_xmit11(struct sk_buff *skb, struct net_device *dev) { 
	}



	if ( skb == NULL ) {

		airo_print_err(dev->name, "%s: skb == NULL!", __FUNCTION__);

		airo_print_err(dev->name, "%s: skb == NULL!", __func__);

		return 0;

	}
@@ -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))

			airo_print_err(ai->dev->name,

				"%s: MAC should be disabled (rid=%04x)",

				__FUNCTION__, rid);

				__func__, rid);

		memset(&cmd, 0, sizeof(cmd));

		memset(&rsp, 0, sizeof(rsp));
@@ -4142,7 +4142,7 @@ static int PC4500_writerid(struct airo_info *ai, u16 rid, 
			&ai->config_desc.rid_desc, sizeof(Rid));



		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;

		} else {

			memcpy((char *)ai->config_desc.virtual_host_addr,
@@ -4151,9 +4151,9 @@ static int PC4500_writerid(struct airo_info *ai, u16 rid, 
			rc = issuecommand(ai, &cmd, &rsp);

			if ((rc & 0xff00) != 0) {

				airo_print_err(ai->dev->name, "%s: Write rid Error %d",

						__FUNCTION__, rc);

						__func__, rc);

				airo_print_err(ai->dev->name, "%s: Cmd=%04x",

						__FUNCTION__, cmd.cmd);

						__func__, cmd.cmd);

			}



			if ((rsp.status & 0x7f00))

drivers/net/wireless/hermes.c

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ int hermes_read_ltv(hermes_t *hw, int bap, u16 rid, unsigned bufsize, 
	if (rtype != rid)

		printk(KERN_WARNING "hermes @ %p: %s(): "

		       "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)

		printk(KERN_WARNING "hermes @ %p: "

		       "Truncating LTV record from %d to %d bytes. "

drivers/net/wireless/ipw2100.c

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static u32 ipw2100_debug_level = IPW_DL_NONE; 
do { \

	if (ipw2100_debug_level & (level)) { \

		printk(KERN_DEBUG "ipw2100: %c %s ", \

                       in_interrupt() ? 'I' : 'U',  __FUNCTION__); \

                       in_interrupt() ? 'I' : 'U',  __func__); \

		printk(message); \

	} \

} while (0)

drivers/net/wireless/ipw2200.h

+2 −2
Original line number Diff line number Diff line
@@ -1394,13 +1394,13 @@ BIT_ARG16(x) 
#define IPW_DEBUG(level, fmt, args...) \

do { if (ipw_debug_level & (level)) \

  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

#define IPW_LL_DEBUG(level, fmt, args...) \

do { if (ipw_debug_level & (level)) \

  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

#define IPW_LL_DEBUG(level, fmt, args...) do {} while (0)

#endif				/* CONFIG_IPW2200_DEBUG */

drivers/net/wireless/iwlwifi/iwl-3945-debug.h

+2 −2
Original line number Diff line number Diff line
@@ -34,12 +34,12 @@ extern u32 iwl3945_debug_level; 
#define IWL_DEBUG(level, fmt, args...) \

do { if (iwl3945_debug_level & (level)) \

  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...) \

do { if ((iwl3945_debug_level & (level)) && net_ratelimit()) \

  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)

{