isdn: replace remaining __FUNCTION__ occurrences

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

4 files changed, 23 insertions, 23 deletions

diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index d4ad6992f776..0f3c66de69bc 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -1924,7 +1924,7 @@ isdn_free_channel(int di, int ch, int usage)
 
         if ((di < 0) || (ch < 0)) {
                 printk(KERN_WARNING "%s: called with invalid drv(%d) or channel(%d)\n",
-                        __FUNCTION__, di, ch);
+                        __func__, di, ch);
                 return;
         }
         for (i = 0; i < ISDN_MAX_CHANNELS; i++)
diff --git a/drivers/isdn/i4l/isdn_net.h b/drivers/isdn/i4l/isdn_net.h
index bc2f0dd962ea..be4949715d55 100644
--- a/drivers/isdn/i4l/isdn_net.h
+++ b/drivers/isdn/i4l/isdn_net.h
@@ -108,7 +108,7 @@ static __inline__ void isdn_net_add_to_bundle(isdn_net_dev *nd, isdn_net_local *
 
         lp = nd->queue;
 //      printk(KERN_DEBUG "%s: lp:%s(%p) nlp:%s(%p) last(%p)\n",
-//              __FUNCTION__, lp->name, lp, nlp->name, nlp, lp->last);
+//              __func__, lp->name, lp, nlp->name, nlp, lp->last);
         nlp->last = lp->last;
         lp->last->next = nlp;
         lp->last = nlp;
@@ -129,7 +129,7 @@ static __inline__ void isdn_net_rm_from_bundle(isdn_net_local *lp)
                 master_lp = (isdn_net_local *) lp->master->priv;
 
 //      printk(KERN_DEBUG "%s: lp:%s(%p) mlp:%s(%p) last(%p) next(%p) mndq(%p)\n",
-//              __FUNCTION__, lp->name, lp, master_lp->name, master_lp, lp->last, lp->next, master_lp->netdev->queue);
+//              __func__, lp->name, lp, master_lp->name, master_lp, lp->last, lp->next, master_lp->netdev->queue);
         spin_lock_irqsave(&master_lp->netdev->queue_lock, flags);
         lp->last->next = lp->next;
         lp->next->last = lp->last;
@@ -141,7 +141,7 @@ static __inline__ void isdn_net_rm_from_bundle(isdn_net_local *lp)
         }
         lp->next = lp->last = lp;       /* (re)set own pointers */
 //      printk(KERN_DEBUG "%s: mndq(%p)\n",
-//              __FUNCTION__, master_lp->netdev->queue);
+//              __func__, master_lp->netdev->queue);
         spin_unlock_irqrestore(&master_lp->netdev->queue_lock, flags);
 }
 
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index 9f5fe372f83d..127cfdad68e7 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -110,7 +110,7 @@ isdn_ppp_free(isdn_net_local * lp)
 
         if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {
                 printk(KERN_ERR "%s: ppp_slot(%d) out of range\n",
-                        __FUNCTION__, lp->ppp_slot);
+                        __func__, lp->ppp_slot);
                 return 0;
         }
 
@@ -127,7 +127,7 @@ isdn_ppp_free(isdn_net_local * lp)
 #endif /* CONFIG_ISDN_MPP */
         if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {
                 printk(KERN_ERR "%s: ppp_slot(%d) now invalid\n",
-                        __FUNCTION__, lp->ppp_slot);
+                        __func__, lp->ppp_slot);
                 return 0;
         }
         is = ippp_table[lp->ppp_slot];
@@ -226,7 +226,7 @@ isdn_ppp_wakeup_daemon(isdn_net_local * lp)
 {
         if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {
                 printk(KERN_ERR "%s: ppp_slot(%d) out of range\n",
-                        __FUNCTION__, lp->ppp_slot);
+                        __func__, lp->ppp_slot);
                 return;
         }
         ippp_table[lp->ppp_slot]->state = IPPP_OPEN | IPPP_CONNECT | IPPP_NOBLOCK;
@@ -245,7 +245,7 @@ isdn_ppp_closewait(int slot)
 
         if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
                 printk(KERN_ERR "%s: slot(%d) out of range\n",
-                        __FUNCTION__, slot);
+                        __func__, slot);
                 return 0;
         }
         is = ippp_table[slot];
@@ -343,7 +343,7 @@ isdn_ppp_release(int min, struct file *file)
         is = file->private_data;
 
         if (!is) {
-                printk(KERN_ERR "%s: no file->private_data\n", __FUNCTION__);
+                printk(KERN_ERR "%s: no file->private_data\n", __func__);
                 return;
         }
         if (is->debug & 0x1)
@@ -353,7 +353,7 @@ isdn_ppp_release(int min, struct file *file)
                 isdn_net_dev *p = is->lp->netdev;
 
                 if (!p) {
-                        printk(KERN_ERR "%s: no lp->netdev\n", __FUNCTION__);
+                        printk(KERN_ERR "%s: no lp->netdev\n", __func__);
                         return;
                 }
                 is->state &= ~IPPP_CONNECT;     /* -> effect: no call of wakeup */
@@ -1080,7 +1080,7 @@ isdn_ppp_push_higher(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buff
                                 printk(KERN_DEBUG "isdn_ppp: VJC_UNCOMP\n");
                         if (net_dev->local->ppp_slot < 0) {
                                 printk(KERN_ERR "%s: net_dev->local->ppp_slot(%d) out of range\n",
-                                        __FUNCTION__, net_dev->local->ppp_slot);
+                                        __func__, net_dev->local->ppp_slot);
                                 goto drop_packet;
                         }
                         if (slhc_remember(ippp_table[net_dev->local->ppp_slot]->slcomp, skb->data, skb->len) <= 0) {
@@ -1107,7 +1107,7 @@ isdn_ppp_push_higher(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buff
                                                           skb_old->len);
                                 if (net_dev->local->ppp_slot < 0) {
                                         printk(KERN_ERR "%s: net_dev->local->ppp_slot(%d) out of range\n",
-                                                __FUNCTION__, net_dev->local->ppp_slot);
+                                                __func__, net_dev->local->ppp_slot);
                                         goto drop_packet;
                                 }
                                 pkt_len = slhc_uncompress(ippp_table[net_dev->local->ppp_slot]->slcomp,
@@ -1553,7 +1553,7 @@ static int isdn_ppp_mp_init( isdn_net_local * lp, ippp_bundle * add_to )
 
         if (lp->ppp_slot < 0) {
                 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n",
-                        __FUNCTION__, lp->ppp_slot);
+                        __func__, lp->ppp_slot);
                 return(-EINVAL);
         }
 
@@ -1604,7 +1604,7 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,
         slot = lp->ppp_slot;
         if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
                 printk(KERN_ERR "%s: lp->ppp_slot(%d)\n",
-                        __FUNCTION__, lp->ppp_slot);
+                        __func__, lp->ppp_slot);
                 stats->frame_drops++;
                 dev_kfree_skb(skb);
                 spin_unlock_irqrestore(&mp->lock, flags);
@@ -1641,7 +1641,7 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,
                 slot = lpq->ppp_slot;
                 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
                         printk(KERN_ERR "%s: lpq->ppp_slot(%d)\n",
-                                __FUNCTION__, lpq->ppp_slot);
+                                __func__, lpq->ppp_slot);
                 } else {
                         u32 lls = ippp_table[slot]->last_link_seqno;
                         if (MP_LT(lls, minseq))
@@ -1875,7 +1875,7 @@ void isdn_ppp_mp_reassembly( isdn_net_dev * net_dev, isdn_net_local * lp,
 
         if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {
                 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n",
-                        __FUNCTION__, lp->ppp_slot);
+                        __func__, lp->ppp_slot);
                 return;
         }
         if( MP_FLAGS(from) == (MP_BEGIN_FRAG | MP_END_FRAG) ) {
@@ -2655,7 +2655,7 @@ static void isdn_ppp_receive_ccp(isdn_net_dev *net_dev, isdn_net_local *lp,
                 lp->ppp_slot);
         if (lp->ppp_slot < 0 || lp->ppp_slot >= ISDN_MAX_CHANNELS) {
                 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n",
-                        __FUNCTION__, lp->ppp_slot);
+                        __func__, lp->ppp_slot);
                 return;
         }
         is = ippp_table[lp->ppp_slot];
@@ -2665,7 +2665,7 @@ static void isdn_ppp_receive_ccp(isdn_net_dev *net_dev, isdn_net_local *lp,
                 int slot = ((isdn_net_local *) (lp->master->priv))->ppp_slot;
                 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
                         printk(KERN_ERR "%s: slot(%d) out of range\n",
-                                __FUNCTION__, slot);
+                                __func__, slot);
                         return;
                 }       
                 mis = ippp_table[slot];
@@ -2829,7 +2829,7 @@ static void isdn_ppp_send_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, struct
                 return;
         if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
                 printk(KERN_ERR "%s: lp->ppp_slot(%d) out of range\n",
-                        __FUNCTION__, slot);
+                        __func__, slot);
                 return;
         }       
         is = ippp_table[slot];
@@ -2852,7 +2852,7 @@ static void isdn_ppp_send_ccp(isdn_net_dev *net_dev, isdn_net_local *lp, struct
                 slot = ((isdn_net_local *) (lp->master->priv))->ppp_slot;
                 if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
                         printk(KERN_ERR "%s: slot(%d) out of range\n",
-                                __FUNCTION__, slot);
+                                __func__, slot);
                         return;
                 }       
                 mis = ippp_table[slot];
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index 133eb18e65cc..8af0df1d5b8c 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -1347,7 +1347,7 @@ isdn_tty_tiocmget(struct tty_struct *tty, struct file *file)
         modem_info *info = (modem_info *) tty->driver_data;
         u_char control, status;
 
-        if (isdn_tty_paranoia_check(info, tty->name, __FUNCTION__))
+        if (isdn_tty_paranoia_check(info, tty->name, __func__))
                 return -ENODEV;
         if (tty->flags & (1 << TTY_IO_ERROR))
                 return -EIO;
@@ -1372,7 +1372,7 @@ isdn_tty_tiocmset(struct tty_struct *tty, struct file *file,
 {
         modem_info *info = (modem_info *) tty->driver_data;
 
-        if (isdn_tty_paranoia_check(info, tty->name, __FUNCTION__))
+        if (isdn_tty_paranoia_check(info, tty->name, __func__))
                 return -ENODEV;
         if (tty->flags & (1 << TTY_IO_ERROR))
                 return -EIO;
@@ -1608,7 +1608,7 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
         if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_open"))
                 return -ENODEV;
         if (!try_module_get(info->owner)) {
-                printk(KERN_WARNING "%s: cannot reserve module\n", __FUNCTION__);
+                printk(KERN_WARNING "%s: cannot reserve module\n", __func__);
                 return -ENODEV;
         }
 #ifdef ISDN_DEBUG_MODEM_OPEN