36 files changed, 134 insertions, 131 deletions

diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 23ae66c76d47..24c6b7ca62be 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -350,7 +350,7 @@ static void capincci_free(struct capidev *cdev, u32 ncci)
                 if (ncci == 0xffffffff || np->ncci == ncci) {
                         *pp = (*pp)->next;
 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
-                        if ((mp = np->minorp) != 0) {
+                        if ((mp = np->minorp) != NULL) {
 #if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE)
                                 capifs_free_ncci(mp->minor);
 #endif
@@ -366,7 +366,7 @@ static void capincci_free(struct capidev *cdev, u32 ncci)
                         }
 #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */
                         kfree(np);
-                        if (*pp == 0) return;
+                        if (*pp == NULL) return;
                 } else {
                         pp = &(*pp)->next;
                 }
@@ -483,7 +483,7 @@ static int handle_recv_skb(struct capiminor *mp, struct sk_buff *skb)
 #endif
                 goto bad;
         }
-        if ((nskb = gen_data_b3_resp_for(mp, skb)) == 0) {
+        if ((nskb = gen_data_b3_resp_for(mp, skb)) == NULL) {
                 printk(KERN_ERR "capi: gen_data_b3_resp failed\n");
                 goto bad;
         }
@@ -512,7 +512,7 @@ bad:
 static void handle_minor_recv(struct capiminor *mp)
 {
         struct sk_buff *skb;
-        while ((skb = skb_dequeue(&mp->inqueue)) != 0) {
+        while ((skb = skb_dequeue(&mp->inqueue)) != NULL) {
                 unsigned int len = skb->len;
                 mp->inbytes -= len;
                 if (handle_recv_skb(mp, skb) < 0) {
@@ -538,7 +538,7 @@ static int handle_minor_send(struct capiminor *mp)
                 return 0;
         }
 
-        while ((skb = skb_dequeue(&mp->outqueue)) != 0) {
+        while ((skb = skb_dequeue(&mp->outqueue)) != NULL) {
                 datahandle = mp->datahandle;
                 len = (u16)skb->len;
                 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
@@ -689,19 +689,19 @@ capi_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
         if (!cdev->ap.applid)
                 return -ENODEV;
 
-        if ((skb = skb_dequeue(&cdev->recvqueue)) == 0) {
+        if ((skb = skb_dequeue(&cdev->recvqueue)) == NULL) {
 
                 if (file->f_flags & O_NONBLOCK)
                         return -EAGAIN;
 
                 for (;;) {
                         interruptible_sleep_on(&cdev->recvwait);
-                        if ((skb = skb_dequeue(&cdev->recvqueue)) != 0)
+                        if ((skb = skb_dequeue(&cdev->recvqueue)) != NULL)
                                 break;
                         if (signal_pending(current))
                                 break;
                 }
-                if (skb == 0)
+                if (skb == NULL)
                         return -ERESTARTNOHAND;
         }
         if (skb->len > count) {
@@ -940,12 +940,12 @@ capi_ioctl(struct inode *inode, struct file *file,
                                 return -EFAULT;
 
                         mutex_lock(&cdev->ncci_list_mtx);
-                        if ((nccip = capincci_find(cdev, (u32) ncci)) == 0) {
+                        if ((nccip = capincci_find(cdev, (u32) ncci)) == NULL) {
                                 mutex_unlock(&cdev->ncci_list_mtx);
                                 return 0;
                         }
 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
-                        if ((mp = nccip->minorp) != 0) {
+                        if ((mp = nccip->minorp) != NULL) {
                                 count += atomic_read(&mp->ttyopencount);
                         }
 #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */
@@ -966,7 +966,7 @@ capi_ioctl(struct inode *inode, struct file *file,
                                 return -EFAULT;
                         mutex_lock(&cdev->ncci_list_mtx);
                         nccip = capincci_find(cdev, (u32) ncci);
-                        if (!nccip || (mp = nccip->minorp) == 0) {
+                        if (!nccip || (mp = nccip->minorp) == NULL) {
                                 mutex_unlock(&cdev->ncci_list_mtx);
                                 return -ESRCH;
                         }
@@ -986,7 +986,7 @@ capi_open(struct inode *inode, struct file *file)
         if (file->private_data)
                 return -EEXIST;
 
-        if ((file->private_data = capidev_alloc()) == 0)
+        if ((file->private_data = capidev_alloc()) == NULL)
                 return -ENOMEM;
 
         return nonseekable_open(inode, file);
@@ -1023,9 +1023,9 @@ static int capinc_tty_open(struct tty_struct * tty, struct file * file)
         struct capiminor *mp;
         unsigned long flags;
 
-        if ((mp = capiminor_find(iminor(file->f_path.dentry->d_inode))) == 0)
+        if ((mp = capiminor_find(iminor(file->f_path.dentry->d_inode))) == NULL)
                 return -ENXIO;
-        if (mp->nccip == 0)
+        if (mp->nccip == NULL)
                 return -ENXIO;
 
         tty->driver_data = (void *)mp;
@@ -1058,7 +1058,7 @@ static void capinc_tty_close(struct tty_struct * tty, struct file * file)
 #ifdef _DEBUG_REFCOUNT
                 printk(KERN_DEBUG "capinc_tty_close ocount=%d\n", atomic_read(&mp->ttyopencount));
 #endif
-                if (mp->nccip == 0)
+                if (mp->nccip == NULL)
                         capiminor_free(mp);
         }
 
@@ -1526,9 +1526,9 @@ static int __init capi_init(void)
         char *compileinfo;
         int major_ret;
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strlcpy(rev, p + 2, sizeof(rev));
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
index cb42b690b45e..d5b4cc357a3c 100644
--- a/drivers/isdn/capi/capidrv.c
+++ b/drivers/isdn/capi/capidrv.c
@@ -335,7 +335,7 @@ static capidrv_plci *new_plci(capidrv_contr * card, int chan)
 
         plcip = kzalloc(sizeof(capidrv_plci), GFP_ATOMIC);
 
-        if (plcip == 0)
+        if (plcip == NULL)
                 return NULL;
 
         plcip->state = ST_PLCI_NONE;
@@ -404,7 +404,7 @@ static inline capidrv_ncci *new_ncci(capidrv_contr * card,
 
         nccip = kzalloc(sizeof(capidrv_ncci), GFP_ATOMIC);
 
-        if (nccip == 0)
+        if (nccip == NULL)
                 return NULL;
 
         nccip->ncci = ncci;
@@ -426,7 +426,7 @@ static inline capidrv_ncci *find_ncci(capidrv_contr * card, u32 ncci)
         capidrv_plci *plcip;
         capidrv_ncci *p;
 
-        if ((plcip = find_plci_by_ncci(card, ncci)) == 0)
+        if ((plcip = find_plci_by_ncci(card, ncci)) == NULL)
                 return NULL;
 
         for (p = plcip->ncci_list; p; p = p->next)
@@ -441,7 +441,7 @@ static inline capidrv_ncci *find_ncci_by_msgid(capidrv_contr * card,
         capidrv_plci *plcip;
         capidrv_ncci *p;
 
-        if ((plcip = find_plci_by_ncci(card, ncci)) == 0)
+        if ((plcip = find_plci_by_ncci(card, ncci)) == NULL)
                 return NULL;
 
         for (p = plcip->ncci_list; p; p = p->next)
@@ -755,7 +755,7 @@ static inline int new_bchan(capidrv_contr * card)
 {
         int i;
         for (i = 0; i < card->nbchan; i++) {
-                if (card->bchans[i].plcip == 0) {
+                if (card->bchans[i].plcip == NULL) {
                         card->bchans[i].disconnecting = 0;
                         return i;
                 }
@@ -877,7 +877,7 @@ static void handle_incoming_call(capidrv_contr * card, _cmsg * cmsg)
                 return;
         }
         bchan = &card->bchans[chan];
-        if ((plcip = new_plci(card, chan)) == 0) {
+        if ((plcip = new_plci(card, chan)) == NULL) {
                 printk(KERN_ERR "capidrv-%d: incoming call: no memory, sorry.\n", card->contrnr);
                 return;
         }
@@ -1388,12 +1388,12 @@ static void capidrv_recv_message(struct capi20_appl *ap, struct sk_buff *skb)
                 _cdebbuf *cdb = capi_cmsg2str(&s_cmsg);
 
                 if (cdb) {
-                        printk(KERN_DEBUG "%s: applid=%d %s\n", __FUNCTION__,
+                        printk(KERN_DEBUG "%s: applid=%d %s\n", __func__,
                                 ap->applid, cdb->buf);
                         cdebbuf_free(cdb);
                 } else
                         printk(KERN_DEBUG "%s: applid=%d %s not traced\n",
-                                __FUNCTION__, ap->applid,
+                                __func__, ap->applid,
                                 capi_cmd2str(s_cmsg.Command, s_cmsg.Subcommand));
         }
         if (s_cmsg.Command == CAPI_DATA_B3
@@ -1661,7 +1661,7 @@ static int capidrv_command(isdn_ctrl * c, capidrv_contr * card)
                                               NULL,     /* Useruserdata */
                                               NULL      /* Facilitydataarray */
                             );
-                        if ((plcip = new_plci(card, (c->arg % card->nbchan))) == 0) {
+                        if ((plcip = new_plci(card, (c->arg % card->nbchan))) == NULL) {
                                 cmd.command = ISDN_STAT_DHUP;
                                 cmd.driver = card->myid;
                                 cmd.arg = (c->arg % card->nbchan);
@@ -1966,7 +1966,7 @@ static void enable_dchannel_trace(capidrv_contr *card)
                         card->name, errcode);
            return;
         }
-        if (strstr(manufacturer, "AVM") == 0) {
+        if (strstr(manufacturer, "AVM") == NULL) {
            printk(KERN_ERR "%s: not from AVM, no d-channel trace possible (%s)\n",
                         card->name, manufacturer);
            return;
@@ -2291,10 +2291,10 @@ static int __init capidrv_init(void)
         u32 ncontr, contr;
         u16 errcode;
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strncpy(rev, p + 2, sizeof(rev));
                 rev[sizeof(rev)-1] = 0;
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
@@ -2335,10 +2335,10 @@ static void __exit capidrv_exit(void)
         char rev[32];
         char *p;
 
-        if ((p = strchr(revision, ':')) != 0) {
+        if ((p = strchr(revision, ':')) != NULL) {
                 strncpy(rev, p + 1, sizeof(rev));
                 rev[sizeof(rev)-1] = 0;
-                if ((p = strchr(rev, '$')) != 0)
+                if ((p = strchr(rev, '$')) != NULL)
                         *p = 0;
         } else {
                 strcpy(rev, " ??? ");
diff --git a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c
index 6d7c47ec0367..550e80f390a6 100644
--- a/drivers/isdn/capi/capifs.c
+++ b/drivers/isdn/capi/capifs.c
@@ -69,6 +69,7 @@ static int capifs_remount(struct super_block *s, int *flags, char *data)
                 } else if (sscanf(this_char, "mode=%o%c", &n, &dummy) == 1)
                         mode = n & ~S_IFMT;
                 else {
+                        kfree(new_opt);
                         printk("capifs: called with bogus options\n");
                         return -EINVAL;
                 }
@@ -189,9 +190,9 @@ static int __init capifs_init(void)
         char *p;
         int err;
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strlcpy(rev, p + 2, sizeof(rev));
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
diff --git a/drivers/isdn/capi/capilib.c b/drivers/isdn/capi/capilib.c
index 68409d971e73..fcaa1241ee77 100644
--- a/drivers/isdn/capi/capilib.c
+++ b/drivers/isdn/capi/capilib.c
@@ -4,7 +4,7 @@
 #include <linux/isdn/capilli.h>
 
 #define DBG(format, arg...) do { \
-printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \
+printk(KERN_DEBUG "%s: " format "\n" , __func__ , ## arg); \
 } while (0)
 
 struct capilib_msgidqueue {
@@ -44,7 +44,7 @@ static inline void mq_init(struct capilib_ncci * np)
 static inline int mq_enqueue(struct capilib_ncci * np, u16 msgid)
 {
         struct capilib_msgidqueue *mq;
-        if ((mq = np->msgidfree) == 0)
+        if ((mq = np->msgidfree) == NULL)
                 return 0;
         np->msgidfree = mq->next;
         mq->msgid = msgid;
diff --git a/drivers/isdn/capi/capiutil.c b/drivers/isdn/capi/capiutil.c
index 22379b94e88f..ebef4ce1b00c 100644
--- a/drivers/isdn/capi/capiutil.c
+++ b/drivers/isdn/capi/capiutil.c
@@ -450,7 +450,7 @@ static void pars_2_message(_cmsg * cmsg)
                         cmsg->l += 4;
                         break;
                 case _CSTRUCT:
-                        if (*(u8 **) OFF == 0) {
+                        if (*(u8 **) OFF == NULL) {
                                 *(cmsg->m + cmsg->l) = '\0';
                                 cmsg->l++;
                         } else if (**(_cstruct *) OFF != 0xff) {
diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c
index f55531869313..75726ea0fbbd 100644
--- a/drivers/isdn/capi/kcapi.c
+++ b/drivers/isdn/capi/kcapi.c
@@ -10,7 +10,7 @@
  *
  */
 
-#define CONFIG_AVMB1_COMPAT
+#define AVMB1_COMPAT
 
 #include "kcapi.h"
 #include <linux/module.h>
@@ -29,7 +29,7 @@
 #include <asm/uaccess.h>
 #include <linux/isdn/capicmd.h>
 #include <linux/isdn/capiutil.h>
-#ifdef CONFIG_AVMB1_COMPAT
+#ifdef AVMB1_COMPAT
 #include <linux/b1lli.h>
 #endif
 #include <linux/mutex.h>
@@ -154,7 +154,7 @@ static void register_appl(struct capi_ctr *card, u16 applid, capi_register_param
         if (card)
                 card->register_appl(card, applid, rparam);
         else
-                printk(KERN_WARNING "%s: cannot get card resources\n", __FUNCTION__);
+                printk(KERN_WARNING "%s: cannot get card resources\n", __func__);
 }
 
 
@@ -178,7 +178,7 @@ static void notify_up(u32 contr)
                 printk(KERN_DEBUG "kcapi: notify up contr %d\n", contr);
         }
         if (!card) {
-                printk(KERN_WARNING "%s: invalid contr %d\n", __FUNCTION__, contr);
+                printk(KERN_WARNING "%s: invalid contr %d\n", __func__, contr);
                 return;
         }
         for (applid = 1; applid <= CAPI_MAXAPPL; applid++) {
@@ -740,7 +740,7 @@ u16 capi20_get_profile(u32 contr, struct capi_profile *profp)
 
 EXPORT_SYMBOL(capi20_get_profile);
 
-#ifdef CONFIG_AVMB1_COMPAT
+#ifdef AVMB1_COMPAT
 static int old_capi_manufacturer(unsigned int cmd, void __user *data)
 {
         avmb1_loadandconfigdef ldef;
@@ -826,7 +826,7 @@ static int old_capi_manufacturer(unsigned int cmd, void __user *data)
                 card = capi_ctr_get(card);
                 if (!card)
                         return -ESRCH;
-                if (card->load_firmware == 0) {
+                if (card->load_firmware == NULL) {
                         printk(KERN_DEBUG "kcapi: load: no load function\n");
                         return -ESRCH;
                 }
@@ -835,7 +835,7 @@ static int old_capi_manufacturer(unsigned int cmd, void __user *data)
                         printk(KERN_DEBUG "kcapi: load: invalid parameter: length of t4file is %d ?\n", ldef.t4file.len);
                         return -EINVAL;
                 }
-                if (ldef.t4file.data == 0) {
+                if (ldef.t4file.data == NULL) {
                         printk(KERN_DEBUG "kcapi: load: invalid parameter: dataptr is 0\n");
                         return -EINVAL;
                 }
@@ -904,7 +904,7 @@ int capi20_manufacturer(unsigned int cmd, void __user *data)
         struct capi_ctr *card;
 
         switch (cmd) {
-#ifdef CONFIG_AVMB1_COMPAT
+#ifdef AVMB1_COMPAT
         case AVMB1_LOAD:
         case AVMB1_LOAD_AND_CONFIG:
         case AVMB1_RESETCARD:
@@ -951,7 +951,7 @@ int capi20_manufacturer(unsigned int cmd, void __user *data)
                         if (strcmp(driver->name, cdef.driver) == 0)
                                 break;
                 }
-                if (driver == 0) {
+                if (driver == NULL) {
                         printk(KERN_ERR "kcapi: driver \"%s\" not loaded.\n",
                                         cdef.driver);
                         return -ESRCH;
@@ -1004,9 +1004,9 @@ static int __init kcapi_init(void)
                 return ret;
         kcapi_proc_init();
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strlcpy(rev, p + 2, sizeof(rev));
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
diff --git a/drivers/isdn/capi/kcapi.h b/drivers/isdn/capi/kcapi.h
index 1cb2c40f9921..244711f7f838 100644
--- a/drivers/isdn/capi/kcapi.h
+++ b/drivers/isdn/capi/kcapi.h
@@ -17,7 +17,7 @@
 
 #ifdef KCAPI_DEBUG
 #define DBG(format, arg...) do { \
-printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \
+printk(KERN_DEBUG "%s: " format "\n" , __func__ , ## arg); \
 } while (0)
 #else
 #define DBG(format, arg...) /* */
diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
index 4484a6417235..abf05ec31760 100644
--- a/drivers/isdn/hardware/avm/b1.c
+++ b/drivers/isdn/hardware/avm/b1.c
@@ -661,11 +661,11 @@ int b1ctl_read_proc(char *page, char **start, off_t off,
         len += sprintf(page+len, "%-16s %s\n", "type", s);
         if (card->cardtype == avm_t1isa)
            len += sprintf(page+len, "%-16s %d\n", "cardnr", card->cardnr);
-        if ((s = cinfo->version[VER_DRIVER]) != 0)
+        if ((s = cinfo->version[VER_DRIVER]) != NULL)
            len += sprintf(page+len, "%-16s %s\n", "ver_driver", s);
-        if ((s = cinfo->version[VER_CARDTYPE]) != 0)
+        if ((s = cinfo->version[VER_CARDTYPE]) != NULL)
            len += sprintf(page+len, "%-16s %s\n", "ver_cardtype", s);
-        if ((s = cinfo->version[VER_SERIAL]) != 0)
+        if ((s = cinfo->version[VER_SERIAL]) != NULL)
            len += sprintf(page+len, "%-16s %s\n", "ver_serial", s);
 
         if (card->cardtype != avm_m1) {
@@ -788,9 +788,9 @@ static int __init b1_init(void)
         char *p;
         char rev[32];
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strlcpy(rev, p + 2, 32);
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
diff --git a/drivers/isdn/hardware/avm/b1dma.c b/drivers/isdn/hardware/avm/b1dma.c
index 669f6f67449c..da34b98e3de7 100644
--- a/drivers/isdn/hardware/avm/b1dma.c
+++ b/drivers/isdn/hardware/avm/b1dma.c
@@ -883,11 +883,11 @@ int b1dmactl_read_proc(char *page, char **start, off_t off,
         default: s = "???"; break;
         }
         len += sprintf(page+len, "%-16s %s\n", "type", s);
-        if ((s = cinfo->version[VER_DRIVER]) != 0)
+        if ((s = cinfo->version[VER_DRIVER]) != NULL)
            len += sprintf(page+len, "%-16s %s\n", "ver_driver", s);
-        if ((s = cinfo->version[VER_CARDTYPE]) != 0)
+        if ((s = cinfo->version[VER_CARDTYPE]) != NULL)
            len += sprintf(page+len, "%-16s %s\n", "ver_cardtype", s);
-        if ((s = cinfo->version[VER_SERIAL]) != 0)
+        if ((s = cinfo->version[VER_SERIAL]) != NULL)
            len += sprintf(page+len, "%-16s %s\n", "ver_serial", s);
 
         if (card->cardtype != avm_m1) {
@@ -970,9 +970,9 @@ static int __init b1dma_init(void)
         char *p;
         char rev[32];
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strlcpy(rev, p + 2, sizeof(rev));
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
diff --git a/drivers/isdn/hardware/avm/b1isa.c b/drivers/isdn/hardware/avm/b1isa.c
index 80fb488848b8..1e288eeb5e2a 100644
--- a/drivers/isdn/hardware/avm/b1isa.c
+++ b/drivers/isdn/hardware/avm/b1isa.c
@@ -203,9 +203,9 @@ static int __init b1isa_init(void)
         char rev[32];
         int i;
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strlcpy(rev, p + 2, 32);
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
diff --git a/drivers/isdn/hardware/avm/b1pci.c b/drivers/isdn/hardware/avm/b1pci.c
index 90e2e6643d19..5b314a2c4049 100644
--- a/drivers/isdn/hardware/avm/b1pci.c
+++ b/drivers/isdn/hardware/avm/b1pci.c
@@ -382,9 +382,9 @@ static int __init b1pci_init(void)
         char rev[32];
         int err;
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strlcpy(rev, p + 2, 32);
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
diff --git a/drivers/isdn/hardware/avm/b1pcmcia.c b/drivers/isdn/hardware/avm/b1pcmcia.c
index e479c0aef38d..7740403b40e1 100644
--- a/drivers/isdn/hardware/avm/b1pcmcia.c
+++ b/drivers/isdn/hardware/avm/b1pcmcia.c
@@ -201,9 +201,9 @@ static int __init b1pcmcia_init(void)
         char *p;
         char rev[32];
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strlcpy(rev, p + 2, 32);
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c
index 4bbbbe688077..9df1d3f66c87 100644
--- a/drivers/isdn/hardware/avm/c4.c
+++ b/drivers/isdn/hardware/avm/c4.c
@@ -1088,11 +1088,11 @@ static int c4_read_proc(char *page, char **start, off_t off,
         default: s = "???"; break;
         }
         len += sprintf(page+len, "%-16s %s\n", "type", s);
-        if ((s = cinfo->version[VER_DRIVER]) != 0)
+        if ((s = cinfo->version[VER_DRIVER]) != NULL)
            len += sprintf(page+len, "%-16s %s\n", "ver_driver", s);
-        if ((s = cinfo->version[VER_CARDTYPE]) != 0)
+        if ((s = cinfo->version[VER_CARDTYPE]) != NULL)
            len += sprintf(page+len, "%-16s %s\n", "ver_cardtype", s);
-        if ((s = cinfo->version[VER_SERIAL]) != 0)
+        if ((s = cinfo->version[VER_SERIAL]) != NULL)
            len += sprintf(page+len, "%-16s %s\n", "ver_serial", s);
 
         if (card->cardtype != avm_m1) {
@@ -1167,7 +1167,7 @@ static int c4_add_card(struct capicardparams *p, struct pci_dev *dev,
         }
 
         card->mbase = ioremap(card->membase, 128);
-        if (card->mbase == 0) {
+        if (card->mbase == NULL) {
                 printk(KERN_NOTICE "c4: can't remap memory at 0x%lx\n",
                        card->membase);
                 retval = -EIO;
@@ -1291,9 +1291,9 @@ static int __init c4_init(void)
         char rev[32];
         int err;
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strlcpy(rev, p + 2, 32);
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
diff --git a/drivers/isdn/hardware/avm/t1isa.c b/drivers/isdn/hardware/avm/t1isa.c
index 6130724e46e7..e7724493738c 100644
--- a/drivers/isdn/hardware/avm/t1isa.c
+++ b/drivers/isdn/hardware/avm/t1isa.c
@@ -551,9 +551,9 @@ static int __init t1isa_init(void)
         char *p;
         int i;
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strlcpy(rev, p + 2, 32);
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
diff --git a/drivers/isdn/hardware/avm/t1pci.c b/drivers/isdn/hardware/avm/t1pci.c
index d1e253c94db4..e6d298d75146 100644
--- a/drivers/isdn/hardware/avm/t1pci.c
+++ b/drivers/isdn/hardware/avm/t1pci.c
@@ -233,9 +233,9 @@ static int __init t1pci_init(void)
         char rev[32];
         int err;
 
-        if ((p = strchr(revision, ':')) != 0 && p[1]) {
+        if ((p = strchr(revision, ':')) != NULL && p[1]) {
                 strlcpy(rev, p + 2, 32);
-                if ((p = strchr(rev, '$')) != 0 && p > rev)
+                if ((p = strchr(rev, '$')) != NULL && p > rev)
                    *(p-1) = 0;
         } else
                 strcpy(rev, "1.0");
diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c
index 6d39f9360766..5fcbdccd7a53 100644
--- a/drivers/isdn/hardware/eicon/divasmain.c
+++ b/drivers/isdn/hardware/eicon/divasmain.c
@@ -393,7 +393,7 @@ void diva_free_dma_map(void *hdev, struct _diva_dma_map_entry *pmap)
         dma_addr_t dma_handle;
         void *addr_handle;
 
-        for (i = 0; (pmap != 0); i++) {
+        for (i = 0; (pmap != NULL); i++) {
                 diva_get_dma_map_entry(pmap, i, &cpu_addr, &phys_addr);
                 if (!cpu_addr) {
                         break;
diff --git a/drivers/isdn/hardware/eicon/message.c b/drivers/isdn/hardware/eicon/message.c
index 1ff98e7eb794..599fed88222d 100644
--- a/drivers/isdn/hardware/eicon/message.c
+++ b/drivers/isdn/hardware/eicon/message.c
@@ -742,7 +742,7 @@ static void start_internal_command (dword Id, PLCI   *plci, t_std_internal_comma
   else
   {
     i = 1;
-    while (plci->internal_command_queue[i] != 0)
+    while (plci->internal_command_queue[i] != NULL)
       i++;
     plci->internal_command_queue[i] = command_function;
   }
@@ -758,7 +758,7 @@ static void next_internal_command (dword Id, PLCI   *plci)
 
   plci->internal_command = 0;
   plci->internal_command_queue[0] = NULL;
-  while (plci->internal_command_queue[1] != 0)
+  while (plci->internal_command_queue[1] != NULL)
   {
     for (i = 0; i < MAX_INTERNAL_COMMAND_LEVELS - 1; i++)
       plci->internal_command_queue[i] = plci->internal_command_queue[i+1];
@@ -9119,7 +9119,7 @@ word AdvCodecSupport(DIVA_CAPI_ADAPTER   *a, PLCI   *plci, APPL   *appl, byte ho
         dbug(1,dprintf("AdvSigPlci=0x%x",a->AdvSignalPLCI));
         return 0x2001; /* codec in use by another application */
       }
-      if(plci!=0)
+      if(plci!=NULL)
       {
         a->AdvSignalPLCI = plci;
         plci->tel=ADV_VOICE;
@@ -9144,7 +9144,7 @@ word AdvCodecSupport(DIVA_CAPI_ADAPTER   *a, PLCI   *plci, APPL   *appl, byte ho
         }
                                                /* indicate D-ch connect if  */
       }                                        /* codec is connected OK     */
-      if(plci!=0)
+      if(plci!=NULL)
       {
         a->AdvSignalPLCI = plci;
         plci->tel=ADV_VOICE;
@@ -9170,7 +9170,7 @@ word AdvCodecSupport(DIVA_CAPI_ADAPTER   *a, PLCI   *plci, APPL   *appl, byte ho
   {
     if(hook_listen) return 0x300B;               /* Facility not supported */
                                                  /* no hook with SCOM      */
-    if(plci!=0) plci->tel = CODEC;
+    if(plci!=NULL) plci->tel = CODEC;
     dbug(1,dprintf("S/SCOM codec"));
     /* first time we use the scom-s codec we must shut down the internal   */
     /* handset application of the card. This can be done by an assign with */
@@ -14604,7 +14604,7 @@ static void channel_xmit_extended_xon (PLCI   * plci) {
   int max_ch = ARRAY_SIZE(a->ch_flow_control);
   int i, one_requested = 0;
 
-  if ((!plci) || (!plci->Id) || ((a = plci->adapter) == 0)) {
+  if ((!plci) || (!plci->Id) || ((a = plci->adapter) == NULL)) {
     return;
   }
 
diff --git a/drivers/isdn/hisax/asuscom.c b/drivers/isdn/hisax/asuscom.c
index b96f3184c2e5..1f879b500d83 100644
--- a/drivers/isdn/hisax/asuscom.c
+++ b/drivers/isdn/hisax/asuscom.c
@@ -344,7 +344,7 @@ setup_asuscom(struct IsdnCard *card)
                                         err = pnp_activate_dev(pnp_d);
                                         if (err<0) {
                                                 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                        __FUNCTION__, err);
+                                                        __func__, err);
                                                 return(0);
                                         }
                                         card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c
index 0f1db1f669b2..7cabc5a19492 100644
--- a/drivers/isdn/hisax/avm_pci.c
+++ b/drivers/isdn/hisax/avm_pci.c
@@ -797,7 +797,7 @@ static int __devinit avm_pnp_setup(struct IsdnCardState *cs)
                         err = pnp_activate_dev(pnp_avm_d);
                         if (err<0) {
                                 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                        __FUNCTION__, err);
+                                        __func__, err);
                                 return(0);
                         }
                         cs->hw.avm.cfg_reg =
diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c
index 2d670856d141..018bd293e580 100644
--- a/drivers/isdn/hisax/diva.c
+++ b/drivers/isdn/hisax/diva.c
@@ -1088,7 +1088,7 @@ static int __devinit setup_diva_isapnp(struct IsdnCard *card)
                                 err = pnp_activate_dev(pnp_d);
                                 if (err<0) {
                                         printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                __FUNCTION__, err);
+                                                __func__, err);
                                         return(0);
                                 }
                                 card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c
index 2c3691fda300..aa29d1cf16af 100644
--- a/drivers/isdn/hisax/elsa.c
+++ b/drivers/isdn/hisax/elsa.c
@@ -937,7 +937,7 @@ setup_elsa_isapnp(struct IsdnCard *card)
                                         err = pnp_activate_dev(pnp_d);
                                         if (err<0) {
                                                 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                        __FUNCTION__, err);
+                                                        __func__, err);
                                                 return(0);
                                         }
                                         card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c
index f4a213877e35..d92e8d6c2ae2 100644
--- a/drivers/isdn/hisax/hfc_sx.c
+++ b/drivers/isdn/hisax/hfc_sx.c
@@ -1417,7 +1417,7 @@ setup_hfcsx(struct IsdnCard *card)
                                         err = pnp_activate_dev(pnp_d);
                                         if (err<0) {
                                                 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                        __FUNCTION__, err);
+                                                        __func__, err);
                                                 return(0);
                                         }
                                         card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c
index 98b0149bca68..8df889b0c1a9 100644
--- a/drivers/isdn/hisax/hfc_usb.c
+++ b/drivers/isdn/hisax/hfc_usb.c
@@ -905,7 +905,7 @@ rx_int_complete(struct urb *urb)
         if (status) {
                 printk(KERN_INFO
                        "HFC-S USB: %s error resubmitting URB fifo(%d)\n",
-                       __FUNCTION__, fifon);
+                       __func__, fifon);
         }
 }
 
@@ -1543,14 +1543,14 @@ hfc_usb_disconnect(struct usb_interface *intf)
                                 stop_isoc_chain(&context->fifos[i]);
                                 DBG(HFCUSB_DBG_INIT,
                                     "HFC-S USB: %s stopping ISOC chain Fifo(%i)",
-                                    __FUNCTION__, i);
+                                    __func__, i);
                         }
                 } else {
                         if (context->fifos[i].active > 0) {
                                 context->fifos[i].active = 0;
                                 DBG(HFCUSB_DBG_INIT,
                                     "HFC-S USB: %s unlinking URB for Fifo(%i)",
-                                    __FUNCTION__, i);
+                                    __func__, i);
                         }
                         usb_kill_urb(context->fifos[i].urb);
                         usb_free_urb(context->fifos[i].urb);
diff --git a/drivers/isdn/hisax/hfcscard.c b/drivers/isdn/hisax/hfcscard.c
index 909d6709ec16..cf082665cc8b 100644
--- a/drivers/isdn/hisax/hfcscard.c
+++ b/drivers/isdn/hisax/hfcscard.c
@@ -193,7 +193,7 @@ setup_hfcs(struct IsdnCard *card)
                                         err = pnp_activate_dev(pnp_d);
                                         if (err<0) {
                                                 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                        __FUNCTION__, err);
+                                                        __func__, err);
                                                 return(0);
                                         }
                                         card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/hisax_debug.h b/drivers/isdn/hisax/hisax_debug.h
index ceafecdb1037..5ed3b1c44184 100644
--- a/drivers/isdn/hisax/hisax_debug.h
+++ b/drivers/isdn/hisax/hisax_debug.h
@@ -27,14 +27,14 @@
 
 #define DBG(level, format, arg...) do { \
 if (level & __debug_variable) \
-printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \
+printk(KERN_DEBUG "%s: " format "\n" , __func__ , ## arg); \
 } while (0)
 
 #define DBG_PACKET(level,data,count) \
-  if (level & __debug_variable) dump_packet(__FUNCTION__,data,count)
+  if (level & __debug_variable) dump_packet(__func__,data,count)
 
 #define DBG_SKB(level,skb) \
-  if ((level & __debug_variable) && skb) dump_packet(__FUNCTION__,skb->data,skb->len)
+  if ((level & __debug_variable) && skb) dump_packet(__func__,skb->data,skb->len)
 
 
 static void __attribute__((unused))
diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index 76043dedba5b..c0b4db2f8364 100644
--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -68,7 +68,7 @@ static struct pci_device_id fcpci_ids[] = {
 
 MODULE_DEVICE_TABLE(pci, fcpci_ids);
 
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
 static struct pnp_device_id fcpnp_ids[] __devinitdata = {
         { 
                 .id             = "AVM0900",
@@ -914,7 +914,7 @@ static int __devinit fcpci_probe(struct pci_dev *pdev,
         return retval;
 }
 
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
 static int __devinit fcpnp_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
 {
         struct fritz_adapter *adapter;
@@ -935,7 +935,7 @@ static int __devinit fcpnp_probe(struct pnp_dev *pdev, const struct pnp_device_i
         pnp_disable_dev(pdev);
         retval = pnp_activate_dev(pdev);
         if (retval < 0) {
-                printk(KERN_WARNING "%s: pnp_activate_dev(%s) ret(%d)\n", __FUNCTION__,
+                printk(KERN_WARNING "%s: pnp_activate_dev(%s) ret(%d)\n", __func__,
                         (char *)dev_id->driver_data, retval);
                 goto err_free;
         }
@@ -974,6 +974,8 @@ static struct pnp_driver fcpnp_driver = {
         .remove         = __devexit_p(fcpnp_remove),
         .id_table       = fcpnp_ids,
 };
+#else
+static struct pnp_driver fcpnp_driver;
 #endif
 
 static void __devexit fcpci_remove(struct pci_dev *pdev)
@@ -1001,7 +1003,7 @@ static int __init hisax_fcpcipnp_init(void)
         retval = pci_register_driver(&fcpci_driver);
         if (retval)
                 return retval;
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
         retval = pnp_register_driver(&fcpnp_driver);
         if (retval < 0) {
                 pci_unregister_driver(&fcpci_driver);
@@ -1013,7 +1015,7 @@ static int __init hisax_fcpcipnp_init(void)
 
 static void __exit hisax_fcpcipnp_exit(void)
 {
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
         pnp_unregister_driver(&fcpnp_driver);
 #endif
         pci_unregister_driver(&fcpci_driver);
diff --git a/drivers/isdn/hisax/ix1_micro.c b/drivers/isdn/hisax/ix1_micro.c
index 2d18d4f1e57e..a92bf0d2cab2 100644
--- a/drivers/isdn/hisax/ix1_micro.c
+++ b/drivers/isdn/hisax/ix1_micro.c
@@ -252,7 +252,7 @@ setup_ix1micro(struct IsdnCard *card)
                                         err = pnp_activate_dev(pnp_d);
                                         if (err<0) {
                                                 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                        __FUNCTION__, err);
+                                                        __func__, err);
                                                 return(0);
                                         }
                                         card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/niccy.c b/drivers/isdn/hisax/niccy.c
index 421b8e6763d7..ef00633e1d2a 100644
--- a/drivers/isdn/hisax/niccy.c
+++ b/drivers/isdn/hisax/niccy.c
@@ -255,7 +255,7 @@ int __devinit setup_niccy(struct IsdnCard *card)
                         err = pnp_activate_dev(pnp_d);
                         if (err < 0) {
                                 printk(KERN_WARNING "%s: pnp_activate_dev "
-                                        "ret(%d)\n", __FUNCTION__, err);
+                                        "ret(%d)\n", __func__, err);
                                 return 0;
                         }
                         card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/sedlbauer.c b/drivers/isdn/hisax/sedlbauer.c
index 95425f3d2220..a10dfa82c734 100644
--- a/drivers/isdn/hisax/sedlbauer.c
+++ b/drivers/isdn/hisax/sedlbauer.c
@@ -555,7 +555,7 @@ setup_sedlbauer_isapnp(struct IsdnCard *card, int *bytecnt)
                                 err = pnp_activate_dev(pnp_d);
                                 if (err<0) {
                                         printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                __FUNCTION__, err);
+                                                __func__, err);
                                         return(0);
                                 }
                                 card->para[1] = pnp_port_start(pnp_d, 0);
diff --git a/drivers/isdn/hisax/st5481.h b/drivers/isdn/hisax/st5481.h
index 04416bad611d..2044e7173ab4 100644
--- a/drivers/isdn/hisax/st5481.h
+++ b/drivers/isdn/hisax/st5481.h
@@ -218,13 +218,13 @@ enum {
 #define L1_EVENT_COUNT (EV_TIMER3 + 1)
 
 #define ERR(format, arg...) \
-printk(KERN_ERR "%s:%s: " format "\n" , __FILE__,  __FUNCTION__ , ## arg)
+printk(KERN_ERR "%s:%s: " format "\n" , __FILE__,  __func__ , ## arg)
 
 #define WARN(format, arg...) \
-printk(KERN_WARNING "%s:%s: " format "\n" , __FILE__,  __FUNCTION__ , ## arg)
+printk(KERN_WARNING "%s:%s: " format "\n" , __FILE__,  __func__ , ## arg)
 
 #define INFO(format, arg...) \
-printk(KERN_INFO "%s:%s: " format "\n" , __FILE__,  __FUNCTION__ , ## arg)
+printk(KERN_INFO "%s:%s: " format "\n" , __FILE__,  __func__ , ## arg)
 
 #include "isdnhdlc.h"
 #include "fsm.h"
@@ -406,7 +406,7 @@ struct st5481_adapter {
 
 /*
  * Submit an URB with error reporting. This is a macro so
- * the __FUNCTION__ returns the caller function name.
+ * the __func__ returns the caller function name.
  */
 #define SUBMIT_URB(urb, mem_flags) \
 ({ \
@@ -470,7 +470,7 @@ extern int st5481_debug;
 #ifdef CONFIG_HISAX_DEBUG
 
 #define DBG_ISO_PACKET(level,urb) \
-  if (level & __debug_variable) dump_iso_packet(__FUNCTION__,urb)
+  if (level & __debug_variable) dump_iso_packet(__func__,urb)
 
 static void __attribute__((unused))
 dump_iso_packet(const char *name, struct urb *urb)
diff --git a/drivers/isdn/hisax/st5481_usb.c b/drivers/isdn/hisax/st5481_usb.c
index 4ada66b8b679..427a8b0520f5 100644
--- a/drivers/isdn/hisax/st5481_usb.c
+++ b/drivers/isdn/hisax/st5481_usb.c
@@ -342,7 +342,7 @@ void st5481_release_usb(struct st5481_adapter *adapter)
         usb_kill_urb(intr->urb);
         kfree(intr->urb->transfer_buffer);
         usb_free_urb(intr->urb);
-        ctrl->urb = NULL;
+        intr->urb = NULL;
 }
 
 /*
diff --git a/drivers/isdn/hisax/teles3.c b/drivers/isdn/hisax/teles3.c
index 6a5e379e0774..5dc9f1a43629 100644
--- a/drivers/isdn/hisax/teles3.c
+++ b/drivers/isdn/hisax/teles3.c
@@ -301,7 +301,7 @@ setup_teles3(struct IsdnCard *card)
                                         err = pnp_activate_dev(pnp_d);
                                         if (err<0) {
                                                 printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
-                                                        __FUNCTION__, err);
+                                                        __func__, err);
                                                 return(0);
                                         }
                                         card->para[3] = pnp_port_start(pnp_d, 2);
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