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/wan/cycx_x25.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/wan/cycx_x25.c')
-rw-r--r-- | drivers/net/wan/cycx_x25.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c index d3b28b01b9f9..5a7303dc0965 100644 --- a/drivers/net/wan/cycx_x25.c +++ b/drivers/net/wan/cycx_x25.c | |||
@@ -874,7 +874,7 @@ static void cycx_x25_irq_connect(struct cycx_device *card, | |||
874 | nibble_to_byte(d + (sizeloc >> 1), rem, sizerem, sizeloc & 1); | 874 | nibble_to_byte(d + (sizeloc >> 1), rem, sizerem, sizeloc & 1); |
875 | 875 | ||
876 | dprintk(1, KERN_INFO "%s:lcn=%d, local=%s, remote=%s\n", | 876 | dprintk(1, KERN_INFO "%s:lcn=%d, local=%s, remote=%s\n", |
877 | __FUNCTION__, lcn, loc, rem); | 877 | __func__, lcn, loc, rem); |
878 | 878 | ||
879 | dev = cycx_x25_get_dev_by_dte_addr(wandev, rem); | 879 | dev = cycx_x25_get_dev_by_dte_addr(wandev, rem); |
880 | if (!dev) { | 880 | if (!dev) { |
@@ -902,7 +902,7 @@ static void cycx_x25_irq_connect_confirm(struct cycx_device *card, | |||
902 | cycx_peek(&card->hw, cmd->buf, &lcn, sizeof(lcn)); | 902 | cycx_peek(&card->hw, cmd->buf, &lcn, sizeof(lcn)); |
903 | cycx_peek(&card->hw, cmd->buf + 1, &key, sizeof(key)); | 903 | cycx_peek(&card->hw, cmd->buf + 1, &key, sizeof(key)); |
904 | dprintk(1, KERN_INFO "%s: %s:lcn=%d, key=%d\n", | 904 | dprintk(1, KERN_INFO "%s: %s:lcn=%d, key=%d\n", |
905 | card->devname, __FUNCTION__, lcn, key); | 905 | card->devname, __func__, lcn, key); |
906 | 906 | ||
907 | dev = cycx_x25_get_dev_by_lcn(wandev, -key); | 907 | dev = cycx_x25_get_dev_by_lcn(wandev, -key); |
908 | if (!dev) { | 908 | if (!dev) { |
@@ -929,7 +929,7 @@ static void cycx_x25_irq_disconnect_confirm(struct cycx_device *card, | |||
929 | 929 | ||
930 | cycx_peek(&card->hw, cmd->buf, &lcn, sizeof(lcn)); | 930 | cycx_peek(&card->hw, cmd->buf, &lcn, sizeof(lcn)); |
931 | dprintk(1, KERN_INFO "%s: %s:lcn=%d\n", | 931 | dprintk(1, KERN_INFO "%s: %s:lcn=%d\n", |
932 | card->devname, __FUNCTION__, lcn); | 932 | card->devname, __func__, lcn); |
933 | dev = cycx_x25_get_dev_by_lcn(wandev, lcn); | 933 | dev = cycx_x25_get_dev_by_lcn(wandev, lcn); |
934 | if (!dev) { | 934 | if (!dev) { |
935 | /* Invalid channel, discard packet */ | 935 | /* Invalid channel, discard packet */ |
@@ -950,7 +950,7 @@ static void cycx_x25_irq_disconnect(struct cycx_device *card, | |||
950 | u8 lcn; | 950 | u8 lcn; |
951 | 951 | ||
952 | cycx_peek(&card->hw, cmd->buf, &lcn, sizeof(lcn)); | 952 | cycx_peek(&card->hw, cmd->buf, &lcn, sizeof(lcn)); |
953 | dprintk(1, KERN_INFO "%s:lcn=%d\n", __FUNCTION__, lcn); | 953 | dprintk(1, KERN_INFO "%s:lcn=%d\n", __func__, lcn); |
954 | 954 | ||
955 | dev = cycx_x25_get_dev_by_lcn(wandev, lcn); | 955 | dev = cycx_x25_get_dev_by_lcn(wandev, lcn); |
956 | if (dev) { | 956 | if (dev) { |
@@ -1381,7 +1381,7 @@ static void cycx_x25_chan_timer(unsigned long d) | |||
1381 | cycx_x25_chan_disconnect(dev); | 1381 | cycx_x25_chan_disconnect(dev); |
1382 | else | 1382 | else |
1383 | printk(KERN_ERR "%s: %s for svc (%s) not connected!\n", | 1383 | printk(KERN_ERR "%s: %s for svc (%s) not connected!\n", |
1384 | chan->card->devname, __FUNCTION__, dev->name); | 1384 | chan->card->devname, __func__, dev->name); |
1385 | } | 1385 | } |
1386 | 1386 | ||
1387 | /* Set logical channel state. */ | 1387 | /* Set logical channel state. */ |
@@ -1485,7 +1485,7 @@ static void cycx_x25_chan_send_event(struct net_device *dev, u8 event) | |||
1485 | unsigned char *ptr; | 1485 | unsigned char *ptr; |
1486 | 1486 | ||
1487 | if ((skb = dev_alloc_skb(1)) == NULL) { | 1487 | if ((skb = dev_alloc_skb(1)) == NULL) { |
1488 | printk(KERN_ERR "%s: out of memory\n", __FUNCTION__); | 1488 | printk(KERN_ERR "%s: out of memory\n", __func__); |
1489 | return; | 1489 | return; |
1490 | } | 1490 | } |
1491 | 1491 | ||