diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-08-20 19:52:04 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-24 18:59:00 -0400 |
commit | b39d66a81fb4f5ab555f86a2e49f3714f8369a3d (patch) | |
tree | 20ffb096fe2781545ac3f77f07ebbb347234e111 /drivers/net/arcnet/arcnet.c | |
parent | b514f6b6da3aedcf4eb6f0c69e910ae89ef4632f (diff) |
drivers/net: replace __FUNCTION__ with __func__
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/arcnet/arcnet.c')
-rw-r--r-- | drivers/net/arcnet/arcnet.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c index bdc4c0bb56d9..a5b07691e466 100644 --- a/drivers/net/arcnet/arcnet.c +++ b/drivers/net/arcnet/arcnet.c | |||
@@ -442,24 +442,24 @@ static int arcnet_open(struct net_device *dev) | |||
442 | BUGMSG(D_NORMAL, "WARNING! Station address FF may confuse " | 442 | BUGMSG(D_NORMAL, "WARNING! Station address FF may confuse " |
443 | "DOS networking programs!\n"); | 443 | "DOS networking programs!\n"); |
444 | 444 | ||
445 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__); | 445 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__); |
446 | if (ASTATUS() & RESETflag) { | 446 | if (ASTATUS() & RESETflag) { |
447 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__); | 447 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__); |
448 | ACOMMAND(CFLAGScmd | RESETclear); | 448 | ACOMMAND(CFLAGScmd | RESETclear); |
449 | } | 449 | } |
450 | 450 | ||
451 | 451 | ||
452 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__); | 452 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__); |
453 | /* make sure we're ready to receive IRQ's. */ | 453 | /* make sure we're ready to receive IRQ's. */ |
454 | AINTMASK(0); | 454 | AINTMASK(0); |
455 | udelay(1); /* give it time to set the mask before | 455 | udelay(1); /* give it time to set the mask before |
456 | * we reset it again. (may not even be | 456 | * we reset it again. (may not even be |
457 | * necessary) | 457 | * necessary) |
458 | */ | 458 | */ |
459 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__); | 459 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__); |
460 | lp->intmask = NORXflag | RECONflag; | 460 | lp->intmask = NORXflag | RECONflag; |
461 | AINTMASK(lp->intmask); | 461 | AINTMASK(lp->intmask); |
462 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__); | 462 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__); |
463 | 463 | ||
464 | netif_start_queue(dev); | 464 | netif_start_queue(dev); |
465 | 465 | ||
@@ -670,14 +670,14 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
670 | freeskb = 0; | 670 | freeskb = 0; |
671 | } | 671 | } |
672 | 672 | ||
673 | BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n",__FILE__,__LINE__,__FUNCTION__,ASTATUS()); | 673 | BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n",__FILE__,__LINE__,__func__,ASTATUS()); |
674 | /* make sure we didn't ignore a TX IRQ while we were in here */ | 674 | /* make sure we didn't ignore a TX IRQ while we were in here */ |
675 | AINTMASK(0); | 675 | AINTMASK(0); |
676 | 676 | ||
677 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__FUNCTION__); | 677 | BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__); |
678 | lp->intmask |= TXFREEflag|EXCNAKflag; | 678 | lp->intmask |= TXFREEflag|EXCNAKflag; |
679 | AINTMASK(lp->intmask); | 679 | AINTMASK(lp->intmask); |
680 | BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n",__FILE__,__LINE__,__FUNCTION__,ASTATUS()); | 680 | BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n",__FILE__,__LINE__,__func__,ASTATUS()); |
681 | 681 | ||
682 | spin_unlock_irqrestore(&lp->lock, flags); | 682 | spin_unlock_irqrestore(&lp->lock, flags); |
683 | if (freeskb) { | 683 | if (freeskb) { |
@@ -798,7 +798,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id) | |||
798 | diagstatus = (status >> 8) & 0xFF; | 798 | diagstatus = (status >> 8) & 0xFF; |
799 | 799 | ||
800 | BUGMSG(D_DEBUG, "%s: %d: %s: status=%x\n", | 800 | BUGMSG(D_DEBUG, "%s: %d: %s: status=%x\n", |
801 | __FILE__,__LINE__,__FUNCTION__,status); | 801 | __FILE__,__LINE__,__func__,status); |
802 | didsomething = 0; | 802 | didsomething = 0; |
803 | 803 | ||
804 | /* | 804 | /* |