diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-07-30 20:20:18 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-30 20:20:18 -0400 |
commit | a97a6f10771b90235b33c13a6db9279237a08422 (patch) | |
tree | 60f73c13805d3e9968ac734960505ab081173945 /drivers/net/irda/irtty-sir.c | |
parent | 1fa98174ba980b2826edd1e4632a17916dfdb4fa (diff) |
irda: 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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/irda/irtty-sir.c')
-rw-r--r-- | drivers/net/irda/irtty-sir.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c index 9e33196f9459..6bcee01c684c 100644 --- a/drivers/net/irda/irtty-sir.c +++ b/drivers/net/irda/irtty-sir.c | |||
@@ -231,7 +231,7 @@ static void irtty_receive_buf(struct tty_struct *tty, const unsigned char *cp, | |||
231 | 231 | ||
232 | dev = priv->dev; | 232 | dev = priv->dev; |
233 | if (!dev) { | 233 | if (!dev) { |
234 | IRDA_WARNING("%s(), not ready yet!\n", __FUNCTION__); | 234 | IRDA_WARNING("%s(), not ready yet!\n", __func__); |
235 | return; | 235 | return; |
236 | } | 236 | } |
237 | 237 | ||
@@ -388,7 +388,7 @@ static int irtty_ioctl(struct tty_struct *tty, struct file *file, unsigned int c | |||
388 | IRDA_ASSERT(priv != NULL, return -ENODEV;); | 388 | IRDA_ASSERT(priv != NULL, return -ENODEV;); |
389 | IRDA_ASSERT(priv->magic == IRTTY_MAGIC, return -EBADR;); | 389 | IRDA_ASSERT(priv->magic == IRTTY_MAGIC, return -EBADR;); |
390 | 390 | ||
391 | IRDA_DEBUG(3, "%s(cmd=0x%X)\n", __FUNCTION__, cmd); | 391 | IRDA_DEBUG(3, "%s(cmd=0x%X)\n", __func__, cmd); |
392 | 392 | ||
393 | dev = priv->dev; | 393 | dev = priv->dev; |
394 | IRDA_ASSERT(dev != NULL, return -1;); | 394 | IRDA_ASSERT(dev != NULL, return -1;); |
@@ -476,7 +476,7 @@ static int irtty_open(struct tty_struct *tty) | |||
476 | 476 | ||
477 | mutex_unlock(&irtty_mutex); | 477 | mutex_unlock(&irtty_mutex); |
478 | 478 | ||
479 | IRDA_DEBUG(0, "%s - %s: irda line discipline opened\n", __FUNCTION__, tty->name); | 479 | IRDA_DEBUG(0, "%s - %s: irda line discipline opened\n", __func__, tty->name); |
480 | 480 | ||
481 | return 0; | 481 | return 0; |
482 | 482 | ||
@@ -528,7 +528,7 @@ static void irtty_close(struct tty_struct *tty) | |||
528 | 528 | ||
529 | kfree(priv); | 529 | kfree(priv); |
530 | 530 | ||
531 | IRDA_DEBUG(0, "%s - %s: irda line discipline closed\n", __FUNCTION__, tty->name); | 531 | IRDA_DEBUG(0, "%s - %s: irda line discipline closed\n", __func__, tty->name); |
532 | } | 532 | } |
533 | 533 | ||
534 | /* ------------------------------------------------------- */ | 534 | /* ------------------------------------------------------- */ |
@@ -566,7 +566,7 @@ static void __exit irtty_sir_cleanup(void) | |||
566 | 566 | ||
567 | if ((err = tty_unregister_ldisc(N_IRDA))) { | 567 | if ((err = tty_unregister_ldisc(N_IRDA))) { |
568 | IRDA_ERROR("%s(), can't unregister line discipline (err = %d)\n", | 568 | IRDA_ERROR("%s(), can't unregister line discipline (err = %d)\n", |
569 | __FUNCTION__, err); | 569 | __func__, err); |
570 | } | 570 | } |
571 | } | 571 | } |
572 | 572 | ||