Commit b39d66a8 authored by Harvey Harrison's avatar Harvey Harrison Committed by Jeff Garzik
Browse files

drivers/net: replace __FUNCTION__ with __func__ 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent b514f6b6

drivers/net/3c505.c

+2 −2
Original line number Diff line number Diff line
@@ -130,12 +130,12 @@ static const char filename[] = __FILE__; 


static const char timeout_msg[] = "*** timeout at %s:%s (line %d) ***\n";

#define TIMEOUT_MSG(lineno) \

	printk(timeout_msg, filename,__FUNCTION__,(lineno))

	printk(timeout_msg, filename,__func__,(lineno))



static const char invalid_pcb_msg[] =

"*** invalid pcb length %d at %s:%s (line %d) ***\n";

#define INVALID_PCB_MSG(len) \

	printk(invalid_pcb_msg, (len),filename,__FUNCTION__,__LINE__)

	printk(invalid_pcb_msg, (len),filename,__func__,__LINE__)



static char search_msg[] __initdata = KERN_INFO "%s: Looking for 3c505 adapter at address %#x...";

drivers/net/arcnet/arcnet.c

+9 −9
Original line number Diff line number Diff line
@@ -442,24 +442,24 @@ static int arcnet_open(struct net_device *dev) 
		BUGMSG(D_NORMAL, "WARNING!  Station address FF may confuse "

		       "DOS networking programs!\n");



	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);

	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);

	if (ASTATUS() & RESETflag) {

	  	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);

	  	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);

		ACOMMAND(CFLAGScmd | RESETclear);

	}





	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);

	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);

	/* make sure we're ready to receive IRQ's. */

	AINTMASK(0);

	udelay(1);		/* give it time to set the mask before

				 * we reset it again. (may not even be

				 * necessary)

				 */

	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);

	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);

	lp->intmask = NORXflag | RECONflag;

	AINTMASK(lp->intmask);

	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);

	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);



	netif_start_queue(dev);
@@ -670,14 +670,14 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev) 
		freeskb = 0;

	}



	BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n",__FILE__,__LINE__,__FUNCTION__,ASTATUS());

	BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n",__FILE__,__LINE__,__func__,ASTATUS());

	/* make sure we didn't ignore a TX IRQ while we were in here */

	AINTMASK(0);



	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);

	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);

	lp->intmask |= TXFREEflag|EXCNAKflag;

	AINTMASK(lp->intmask);

	BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n",__FILE__,__LINE__,__FUNCTION__,ASTATUS());

	BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n",__FILE__,__LINE__,__func__,ASTATUS());



	spin_unlock_irqrestore(&lp->lock, flags);

	if (freeskb) {
@@ -798,7 +798,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id) 
                diagstatus = (status >> 8) & 0xFF;



		BUGMSG(D_DEBUG, "%s: %d: %s: status=%x\n",

			__FILE__,__LINE__,__FUNCTION__,status);

			__FILE__,__LINE__,__func__,status);

		didsomething = 0;



		/*

drivers/net/arcnet/com20020.c

+8 −8
Original line number Diff line number Diff line
@@ -238,15 +238,15 @@ static int com20020_reset(struct net_device *dev, int really_reset) 
	u_char inbyte;



	BUGMSG(D_DEBUG, "%s: %d: %s: dev: %p, lp: %p, dev->name: %s\n",

		__FILE__,__LINE__,__FUNCTION__,dev,lp,dev->name);

		__FILE__,__LINE__,__func__,dev,lp,dev->name);

	BUGMSG(D_INIT, "Resetting %s (status=%02Xh)\n",

	       dev->name, ASTATUS());



	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);

	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);

	lp->config = TXENcfg | (lp->timeout << 3) | (lp->backplane << 2);

	/* power-up defaults */

	SETCONF;

	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);

	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);



	if (really_reset) {

		/* reset the card */
@@ -254,22 +254,22 @@ static int com20020_reset(struct net_device *dev, int really_reset) 
		mdelay(RESETtime * 2);	/* COM20020 seems to be slower sometimes */

	}

	/* clear flags & end reset */

	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);

	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);

	ACOMMAND(CFLAGScmd | RESETclear | CONFIGclear);



	/* verify that the ARCnet signature byte is present */

	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);

	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);



	com20020_copy_from_card(dev, 0, 0, &inbyte, 1);

	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);

	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);

	if (inbyte != TESTvalue) {

		BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);

		BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);

		BUGMSG(D_NORMAL, "reset failed: TESTvalue not present.\n");

		return 1;

	}

	/* enable extended (512-byte) packets */

	ACOMMAND(CONFIGcmd | EXTconf);

	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__);

	BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);



	/* done!  return success. */

	return 0;

drivers/net/ax88796.c

+7 −7
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static void ax_reset_8390(struct net_device *dev) 
	while ((ei_inb(addr + EN0_ISR) & ENISR_RESET) == 0) {

		if (jiffies - reset_start_time > 2*HZ/100) {

			dev_warn(&ax->dev->dev, "%s: %s did not complete.\n",

			       __FUNCTION__, dev->name);

			       __func__, dev->name);

			break;

		}

	}
@@ -173,7 +173,7 @@ static void ax_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, 
	if (ei_status.dmaing) {

		dev_err(&ax->dev->dev, "%s: DMAing conflict in %s "

			"[DMAstat:%d][irqlock:%d].\n",

			dev->name, __FUNCTION__,

			dev->name, __func__,

			ei_status.dmaing, ei_status.irqlock);

		return;

	}
@@ -215,7 +215,7 @@ static void ax_block_input(struct net_device *dev, int count, 
		dev_err(&ax->dev->dev,

			"%s: DMAing conflict in %s "

			"[DMAstat:%d][irqlock:%d].\n",

			dev->name, __FUNCTION__,

			dev->name, __func__,

			ei_status.dmaing, ei_status.irqlock);

		return;

	}
@@ -260,7 +260,7 @@ static void ax_block_output(struct net_device *dev, int count, 
	if (ei_status.dmaing) {

		dev_err(&ax->dev->dev, "%s: DMAing conflict in %s."

			"[DMAstat:%d][irqlock:%d]\n",

			dev->name, __FUNCTION__,

			dev->name, __func__,

		       ei_status.dmaing, ei_status.irqlock);

		return;

	}
@@ -396,7 +396,7 @@ ax_phy_issueaddr(struct net_device *dev, int phy_addr, int reg, int opc) 
{

	if (phy_debug)

		pr_debug("%s: dev %p, %04x, %04x, %d\n",

			__FUNCTION__, dev, phy_addr, reg, opc);

			__func__, dev, phy_addr, reg, opc);



	ax_mii_ei_outbits(dev, 0x3f, 6);	/* pre-amble */

	ax_mii_ei_outbits(dev, 1, 2);		/* frame-start */
@@ -422,7 +422,7 @@ ax_phy_read(struct net_device *dev, int phy_addr, int reg) 
      	spin_unlock_irqrestore(&ei_local->page_lock, flags);



	if (phy_debug)

		pr_debug("%s: %04x.%04x => read %04x\n", __FUNCTION__,

		pr_debug("%s: %04x.%04x => read %04x\n", __func__,

			 phy_addr, reg, result);



	return result;
@@ -436,7 +436,7 @@ ax_phy_write(struct net_device *dev, int phy_addr, int reg, int value) 
	unsigned long flags;



	dev_dbg(&ax->dev->dev, "%s: %p, %04x, %04x %04x\n",

		__FUNCTION__, dev, phy_addr, reg, value);

		__func__, dev, phy_addr, reg, value);



      	spin_lock_irqsave(&ei->page_lock, flags);

drivers/net/bfin_mac.c

+4 −4
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ static void bfin_mac_enable(void) 
{

	u32 opmode;



	pr_debug("%s: %s\n", DRV_NAME, __FUNCTION__);

	pr_debug("%s: %s\n", DRV_NAME, __func__);



	/* Set RX DMA */

	bfin_write_DMA1_NEXT_DESC_PTR(&(rx_list_head->desc_a));
@@ -847,7 +847,7 @@ static void bfin_mac_enable(void) 
/* Our watchdog timed out. Called by the networking layer */

static void bfin_mac_timeout(struct net_device *dev)

{

	pr_debug("%s: %s\n", dev->name, __FUNCTION__);

	pr_debug("%s: %s\n", dev->name, __func__);



	bfin_mac_disable();
@@ -949,7 +949,7 @@ static int bfin_mac_open(struct net_device *dev) 
{

	struct bfin_mac_local *lp = netdev_priv(dev);

	int retval;

	pr_debug("%s: %s\n", dev->name, __FUNCTION__);

	pr_debug("%s: %s\n", dev->name, __func__);



	/*

	 * Check that the address is valid.  If its not, refuse
@@ -989,7 +989,7 @@ static int bfin_mac_open(struct net_device *dev) 
static int bfin_mac_close(struct net_device *dev)

{

	struct bfin_mac_local *lp = netdev_priv(dev);

	pr_debug("%s: %s\n", dev->name, __FUNCTION__);

	pr_debug("%s: %s\n", dev->name, __func__);



	netif_stop_queue(dev);

	netif_carrier_off(dev);