54 files changed, 99 insertions, 240 deletions

diff --git a/drivers/isdn/act2000/module.c b/drivers/isdn/act2000/module.c
index 90593e2ef872..e3e5c1399076 100644
--- a/drivers/isdn/act2000/module.c
+++ b/drivers/isdn/act2000/module.c
@@ -573,12 +573,11 @@ act2000_alloccard(int bus, int port, int irq, char *id)
 {
         int i;
         act2000_card *card;
-        if (!(card = (act2000_card *) kmalloc(sizeof(act2000_card), GFP_KERNEL))) {
+        if (!(card = kzalloc(sizeof(act2000_card), GFP_KERNEL))) {
                 printk(KERN_WARNING
                        "act2000: (%s) Could not allocate card-struct.\n", id);
                 return;
         }
-        memset((char *) card, 0, sizeof(act2000_card));
         spin_lock_init(&card->lock);
         spin_lock_init(&card->mnlock);
         skb_queue_head_init(&card->sndq);
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 11844bbfe933..d22c0224fde6 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -215,13 +215,12 @@ static struct capiminor *capiminor_alloc(struct capi20_appl *ap, u32 ncci)
         unsigned int minor = 0;
         unsigned long flags;
 
-        mp = kmalloc(sizeof(*mp), GFP_ATOMIC);
+        mp = kzalloc(sizeof(*mp), GFP_ATOMIC);
         if (!mp) {
                 printk(KERN_ERR "capi: can't alloc capiminor\n");
                 return NULL;
         }
 
-        memset(mp, 0, sizeof(struct capiminor));
         mp->ap = ap;
         mp->ncci = ncci;
         mp->msgid = 0;
@@ -304,10 +303,9 @@ static struct capincci *capincci_alloc(struct capidev *cdev, u32 ncci)
         struct capiminor *mp = NULL;
 #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */
 
-        np = kmalloc(sizeof(*np), GFP_ATOMIC);
+        np = kzalloc(sizeof(*np), GFP_ATOMIC);
         if (!np)
                 return NULL;
-        memset(np, 0, sizeof(struct capincci));
         np->ncci = ncci;
         np->cdev = cdev;
 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
@@ -384,10 +382,9 @@ static struct capidev *capidev_alloc(void)
         struct capidev *cdev;
         unsigned long flags;
 
-        cdev = kmalloc(sizeof(*cdev), GFP_KERNEL);
+        cdev = kzalloc(sizeof(*cdev), GFP_KERNEL);
         if (!cdev)
                 return NULL;
-        memset(cdev, 0, sizeof(struct capidev));
 
         init_MUTEX(&cdev->ncci_list_sem);
         skb_queue_head_init(&cdev->recvqueue);
@@ -1010,7 +1007,7 @@ static int capinc_tty_open(struct tty_struct * tty, struct file * file)
 {
         struct capiminor *mp;
 
-        if ((mp = capiminor_find(iminor(file->f_dentry->d_inode))) == 0)
+        if ((mp = capiminor_find(iminor(file->f_path.dentry->d_inode))) == 0)
                 return -ENXIO;
         if (mp->nccip == 0)
                 return -ENXIO;
@@ -1203,7 +1200,7 @@ static int capinc_tty_ioctl(struct tty_struct *tty, struct file * file,
         return error;
 }
 
-static void capinc_tty_set_termios(struct tty_struct *tty, struct termios * old)
+static void capinc_tty_set_termios(struct tty_struct *tty, struct ktermios * old)
 {
 #ifdef _DEBUG_TTYFUNCS
         printk(KERN_DEBUG "capinc_tty_set_termios\n");
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
index b6f9476c0501..097bfa7bc323 100644
--- a/drivers/isdn/capi/capidrv.c
+++ b/drivers/isdn/capi/capidrv.c
@@ -334,12 +334,11 @@ static capidrv_plci *new_plci(capidrv_contr * card, int chan)
 {
         capidrv_plci *plcip;
 
-        plcip = (capidrv_plci *) kmalloc(sizeof(capidrv_plci), GFP_ATOMIC);
+        plcip = kzalloc(sizeof(capidrv_plci), GFP_ATOMIC);
 
         if (plcip == 0)
                 return NULL;
 
-        memset(plcip, 0, sizeof(capidrv_plci));
         plcip->state = ST_PLCI_NONE;
         plcip->plci = 0;
         plcip->msgid = 0;
@@ -404,12 +403,11 @@ static inline capidrv_ncci *new_ncci(capidrv_contr * card,
 {
         capidrv_ncci *nccip;
 
-        nccip = (capidrv_ncci *) kmalloc(sizeof(capidrv_ncci), GFP_ATOMIC);
+        nccip = kzalloc(sizeof(capidrv_ncci), GFP_ATOMIC);
 
         if (nccip == 0)
                 return NULL;
 
-        memset(nccip, 0, sizeof(capidrv_ncci));
         nccip->ncci = ncci;
         nccip->state = ST_NCCI_NONE;
         nccip->plcip = plcip;
@@ -2005,12 +2003,11 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp)
                 printk(KERN_WARNING "capidrv: (%s) Could not reserve module\n", id);
                 return -1;
         }
-        if (!(card = (capidrv_contr *) kmalloc(sizeof(capidrv_contr), GFP_ATOMIC))) {
+        if (!(card = kzalloc(sizeof(capidrv_contr), GFP_ATOMIC))) {
                 printk(KERN_WARNING
                  "capidrv: (%s) Could not allocate contr-struct.\n", id);
                 return -1;
         }
-        memset(card, 0, sizeof(capidrv_contr));
         card->owner = THIS_MODULE;
         init_timer(&card->listentimer);
         strcpy(card->name, id);
diff --git a/drivers/isdn/gigaset/Kconfig b/drivers/isdn/gigaset/Kconfig
index 5b203fe21dcd..708d47a6484b 100644
--- a/drivers/isdn/gigaset/Kconfig
+++ b/drivers/isdn/gigaset/Kconfig
@@ -5,6 +5,7 @@ config ISDN_DRV_GIGASET
         tristate "Siemens Gigaset support (isdn)"
         depends on ISDN_I4L
         select CRC_CCITT
+        select BITREVERSE
         help
           Say m here if you have a Gigaset or Sinus isdn device.
 
diff --git a/drivers/isdn/gigaset/asyncdata.c b/drivers/isdn/gigaset/asyncdata.c
index ce3cd77094b3..88e958f176d2 100644
--- a/drivers/isdn/gigaset/asyncdata.c
+++ b/drivers/isdn/gigaset/asyncdata.c
@@ -15,6 +15,7 @@
 
 #include "gigaset.h"
 #include <linux/crc-ccitt.h>
+#include <linux/bitrev.h>
 
 //#define GIG_M10x_STUFF_VOICE_DATA
 
@@ -302,7 +303,7 @@ static inline int iraw_loop(unsigned char c, unsigned char *src, int numbytes,
                                 inputstate |= INS_skip_frame;
                                 break;
                         }
-                        *__skb_put(skb, 1) = gigaset_invtab[c];
+                        *__skb_put(skb, 1) = bitrev8(c);
                 }
 
                 if (unlikely(!numbytes))
@@ -543,7 +544,7 @@ static struct sk_buff *iraw_encode(struct sk_buff *skb, int head, int tail)
         cp = skb->data;
         len = skb->len;
         while (len--) {
-                c = gigaset_invtab[*cp++];
+                c = bitrev8(*cp++);
                 if (c == DLE_FLAG)
                         *(skb_put(iraw_skb, 1)) = c;
                 *(skb_put(iraw_skb, 1)) = c;
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index defd5743dba6..95eff3b2917a 100644
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -33,43 +33,6 @@ MODULE_PARM_DESC(debug, "debug level");
 #define VALID_ID        0x02
 #define ASSIGNED        0x04
 
-/* bitwise byte inversion table */
-__u8 gigaset_invtab[256] = {
-        0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
-        0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
-        0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
-        0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
-        0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
-        0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
-        0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
-        0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
-        0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
-        0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
-        0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
-        0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
-        0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
-        0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
-        0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
-        0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
-        0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
-        0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
-        0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
-        0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
-        0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
-        0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
-        0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
-        0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
-        0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
-        0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
-        0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
-        0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
-        0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
-        0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
-        0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
-        0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff
-};
-EXPORT_SYMBOL_GPL(gigaset_invtab);
-
 void gigaset_dbg_buffer(enum debuglevel level, const unsigned char *msg,
                         size_t len, const unsigned char *buf)
 {
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
index 06298cc52bf5..a0317abaeb11 100644
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -876,10 +876,6 @@ static inline void gigaset_rcv_error(struct sk_buff *procskb,
         }
 }
 
-
-/* bitwise byte inversion table */
-extern __u8 gigaset_invtab[];   /* in common.c */
-
 /* append received bytes to inbuf */
 int gigaset_fill_inbuf(struct inbuf_t *inbuf, const unsigned char *src,
                        unsigned numbytes);
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
index 7edea015867e..458b6462f937 100644
--- a/drivers/isdn/gigaset/interface.c
+++ b/drivers/isdn/gigaset/interface.c
@@ -127,7 +127,7 @@ static int  if_write_room(struct tty_struct *tty);
 static int  if_chars_in_buffer(struct tty_struct *tty);
 static void if_throttle(struct tty_struct *tty);
 static void if_unthrottle(struct tty_struct *tty);
-static void if_set_termios(struct tty_struct *tty, struct termios *old);
+static void if_set_termios(struct tty_struct *tty, struct ktermios *old);
 static int  if_tiocmget(struct tty_struct *tty, struct file *file);
 static int  if_tiocmset(struct tty_struct *tty, struct file *file,
                         unsigned int set, unsigned int clear);
@@ -490,7 +490,7 @@ static void if_unthrottle(struct tty_struct *tty)
         mutex_unlock(&cs->mutex);
 }
 
-static void if_set_termios(struct tty_struct *tty, struct termios *old)
+static void if_set_termios(struct tty_struct *tty, struct ktermios *old)
 {
         struct cardstate *cs;
         unsigned int iflag;
diff --git a/drivers/isdn/gigaset/isocdata.c b/drivers/isdn/gigaset/isocdata.c
index 8667daaa1a82..df988eb0e36f 100644
--- a/drivers/isdn/gigaset/isocdata.c
+++ b/drivers/isdn/gigaset/isocdata.c
@@ -14,6 +14,7 @@
 
 #include "gigaset.h"
 #include <linux/crc-ccitt.h>
+#include <linux/bitrev.h>
 
 /* access methods for isowbuf_t */
 /* ============================ */
@@ -487,7 +488,7 @@ static inline int trans_buildframe(struct isowbuf_t *iwb,
         gig_dbg(DEBUG_STREAM, "put %d bytes", count);
         write = atomic_read(&iwb->write);
         do {
-                c = gigaset_invtab[*in++];
+                c = bitrev8(*in++);
                 iwb->data[write++] = c;
                 write %= BAS_OUTBUFSIZE;
         } while (--count > 0);
@@ -876,7 +877,7 @@ static inline void trans_receive(unsigned char *src, unsigned count,
         while (count > 0) {
                 dst = skb_put(skb, count < dobytes ? count : dobytes);
                 while (count > 0 && dobytes > 0) {
-                        *dst++ = gigaset_invtab[*src++];
+                        *dst++ = bitrev8(*src++);
                         count--;
                         dobytes--;
                 }
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index fd5d7364a487..eba10466ccc6 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -121,10 +121,9 @@ static int avmcs_probe(struct pcmcia_device *p_dev)
     p_dev->conf.Present = PRESENT_OPTION;
 
     /* Allocate space for private device-specific data */
-    local = kmalloc(sizeof(local_info_t), GFP_KERNEL);
+    local = kzalloc(sizeof(local_info_t), GFP_KERNEL);
     if (!local)
         goto err;
-    memset(local, 0, sizeof(local_info_t));
     p_dev->priv = local;
 
     return avmcs_config(p_dev);
diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
index da2729247713..7a69a18d07e2 100644
--- a/drivers/isdn/hardware/avm/b1.c
+++ b/drivers/isdn/hardware/avm/b1.c
@@ -65,18 +65,15 @@ avmcard *b1_alloc_card(int nr_controllers)
         avmctrl_info *cinfo;
         int i;
 
-        card = kmalloc(sizeof(*card), GFP_KERNEL);
+        card = kzalloc(sizeof(*card), GFP_KERNEL);
         if (!card)
                 return NULL;
 
-        memset(card, 0, sizeof(*card));
-
-        cinfo = kmalloc(sizeof(*cinfo) * nr_controllers, GFP_KERNEL);
+        cinfo = kzalloc(sizeof(*cinfo) * nr_controllers, GFP_KERNEL);
         if (!cinfo) {
                 kfree(card);
                 return NULL;
         }
-        memset(cinfo, 0, sizeof(*cinfo) * nr_controllers);
 
         card->ctrlinfo = cinfo;
         for (i = 0; i < nr_controllers; i++) {
@@ -718,12 +715,11 @@ avmcard_dma_alloc(char *name, struct pci_dev *pdev, long rsize, long ssize)
         avmcard_dmainfo *p;
         void *buf;
 
-        p = kmalloc(sizeof(avmcard_dmainfo), GFP_KERNEL);
+        p = kzalloc(sizeof(avmcard_dmainfo), GFP_KERNEL);
         if (!p) {
                 printk(KERN_WARNING "%s: no memory.\n", name);
                 goto err;
         }
-        memset(p, 0, sizeof(avmcard_dmainfo));
 
         p->recvbuf.size = rsize;
         buf = pci_alloc_consistent(pdev, rsize, &p->recvbuf.dmaaddr);
diff --git a/drivers/isdn/hardware/avm/t1isa.c b/drivers/isdn/hardware/avm/t1isa.c
index e47c60b0a8ec..c925020fe9b7 100644
--- a/drivers/isdn/hardware/avm/t1isa.c
+++ b/drivers/isdn/hardware/avm/t1isa.c
@@ -584,6 +584,7 @@ static void __exit t1isa_exit(void)
 {
         int i;
 
+        unregister_capi_driver(&capi_driver_t1isa);
         for (i = 0; i < MAX_CARDS; i++) {
                 if (!io[i])
                         break;
diff --git a/drivers/isdn/hardware/eicon/debug.c b/drivers/isdn/hardware/eicon/debug.c
index 6851c6270ce8..d835e74ecf18 100644
--- a/drivers/isdn/hardware/eicon/debug.c
+++ b/drivers/isdn/hardware/eicon/debug.c
@@ -756,14 +756,14 @@ int diva_get_driver_info (dword id, byte* data, int data_length) {
 
     data_length -= 9;
 
-    if ((to_copy = MIN(strlen(clients[id].drvName), data_length-1))) {
+    if ((to_copy = min(strlen(clients[id].drvName), (size_t)(data_length-1)))) {
       memcpy (p, clients[id].drvName, to_copy);
       p += to_copy;
       data_length -= to_copy;
       if ((data_length >= 4) && clients[id].hDbg->drvTag[0]) {
         *p++ = '(';
         data_length -= 1;
-        if ((to_copy = MIN(strlen(clients[id].hDbg->drvTag), data_length-2))) {
+        if ((to_copy = min(strlen(clients[id].hDbg->drvTag), (size_t)(data_length-2)))) {
           memcpy (p, clients[id].hDbg->drvTag, to_copy);
           p += to_copy;
           data_length -= to_copy;
diff --git a/drivers/isdn/hardware/eicon/di.c b/drivers/isdn/hardware/eicon/di.c
index 0617d7cabf06..e1df8d98c311 100644
--- a/drivers/isdn/hardware/eicon/di.c
+++ b/drivers/isdn/hardware/eicon/di.c
@@ -133,7 +133,7 @@ void pr_out(ADAPTER * a)
     i = this->XCurrent;
     X = PTR_X(a,this);
     while(i<this->XNum && length<270) {
-      clength = MIN((word)(270-length),X[i].PLength-this->XOffset);
+      clength = min((word)(270-length),(word)(X[i].PLength-this->XOffset));
       a->ram_out_buffer(a,
                         &ReqOut->XBuffer.P[length],
                         PTR_P(a,this,&X[i].P[this->XOffset]),
@@ -622,7 +622,7 @@ byte isdn_ind(ADAPTER * a,
                                                      sizeof(a->stream_buffer),
                                                      &final, NULL, NULL);
         }
-        IoAdapter->RBuffer.length = MIN(MLength, 270);
+        IoAdapter->RBuffer.length = min(MLength, (word)270);
         if (IoAdapter->RBuffer.length != MLength) {
           this->complete = 0;
         } else {
@@ -676,9 +676,9 @@ byte isdn_ind(ADAPTER * a,
         this->RCurrent++;
       }
       if (cma) {
-        clength = MIN(MLength, R[this->RCurrent].PLength-this->ROffset);
+        clength = min(MLength, (word)(R[this->RCurrent].PLength-this->ROffset));
       } else {
-        clength = MIN(a->ram_inw(a, &RBuffer->length)-offset,
+        clength = min(a->ram_inw(a, &RBuffer->length)-offset,
                       R[this->RCurrent].PLength-this->ROffset);
       }
       if(R[this->RCurrent].P) {
diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c
index dae2e83dd5e8..91fc92c01afe 100644
--- a/drivers/isdn/hardware/eicon/divasmain.c
+++ b/drivers/isdn/hardware/eicon/divasmain.c
@@ -185,7 +185,7 @@ void diva_log_info(unsigned char *format, ...)
         unsigned char line[160];
 
         va_start(args, format);
-        vsprintf(line, format, args);
+        vsnprintf(line, sizeof(line), format, args);
         va_end(args);
 
         printk(KERN_INFO "%s: %s\n", DRIVERLNAME, line);
diff --git a/drivers/isdn/hardware/eicon/io.c b/drivers/isdn/hardware/eicon/io.c
index 4a27e230b0a5..6fd9b007417d 100644
--- a/drivers/isdn/hardware/eicon/io.c
+++ b/drivers/isdn/hardware/eicon/io.c
@@ -262,7 +262,7 @@ void request(PISDN_ADAPTER IoAdapter, ENTITY * e)
     case IDI_SYNC_REQ_XDI_GET_CAPI_PARAMS: {
        diva_xdi_get_capi_parameters_t prms, *pI = &syncReq->xdi_capi_prms.info;
        memset (&prms, 0x00, sizeof(prms));
-       prms.structure_length = MIN(sizeof(prms), pI->structure_length);
+       prms.structure_length = min_t(size_t, sizeof(prms), pI->structure_length);
        memset (pI, 0x00, pI->structure_length);
        prms.flag_dynamic_l1_down    = (IoAdapter->capi_cfg.cfg_1 & \
          DIVA_XDI_CAPI_CFG_1_DYNAMIC_L1_ON) ? 1 : 0;
diff --git a/drivers/isdn/hardware/eicon/istream.c b/drivers/isdn/hardware/eicon/istream.c
index 23139668d9b1..18f8798442fa 100644
--- a/drivers/isdn/hardware/eicon/istream.c
+++ b/drivers/isdn/hardware/eicon/istream.c
@@ -92,7 +92,7 @@ int diva_istream_write (void* context,
     return (-1); /* was not able to write       */
    break;     /* only part of message was written */
   }
-  to_write = MIN(length, DIVA_DFIFO_DATA_SZ);
+  to_write = min(length, DIVA_DFIFO_DATA_SZ);
   if (to_write) {
    a->ram_out_buffer (a,
 #ifdef PLATFORM_GT_32BIT
@@ -176,7 +176,7 @@ int diva_istream_read (void* context,
     return (-1); /* was not able to read */
    break;
   }
-  to_read = MIN(max_length, tmp[1]);
+  to_read = min(max_length, (int)tmp[1]);
   if (to_read) {
    a->ram_in_buffer(a,
 #ifdef PLATFORM_GT_32BIT
diff --git a/drivers/isdn/hardware/eicon/platform.h b/drivers/isdn/hardware/eicon/platform.h
index a66836cf756c..2444811e0b38 100644
--- a/drivers/isdn/hardware/eicon/platform.h
+++ b/drivers/isdn/hardware/eicon/platform.h
@@ -83,14 +83,6 @@
 #define NULL    ((void *) 0)
 #endif
 
-#ifndef MIN
-#define MIN(a,b)        ((a)>(b) ? (b) : (a))
-#endif
-
-#ifndef MAX
-#define MAX(a,b)        ((a)>(b) ? (a) : (b))
-#endif
-
 #ifndef far
 #define far
 #endif
diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig
index cfd2718a490d..6fa12cc8e4ff 100644
--- a/drivers/isdn/hisax/Kconfig
+++ b/drivers/isdn/hisax/Kconfig
@@ -349,13 +349,6 @@ config HISAX_ENTERNOW_PCI
           This enables HiSax support for the Formula-n enter:now PCI
           ISDN card.
 
-config HISAX_AMD7930
-        bool "Am7930 (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && SPARC && BROKEN
-        help
-          This enables HiSax support for the AMD7930 chips on some SPARCs.
-          This code is not finished yet.
-
 endif
 
 if ISDN_DRV_HISAX
@@ -402,6 +395,7 @@ config HISAX_ST5481
         tristate "ST5481 USB ISDN modem (EXPERIMENTAL)"
         depends on USB && EXPERIMENTAL
         select CRC_CCITT
+        select BITREVERSE
         help
           This enables the driver for ST5481 based USB ISDN adapters,
           e.g. the BeWan Gazel 128 USB
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
index 876fec6c6be8..9e70c206779e 100644
--- a/drivers/isdn/hisax/avma1_cs.c
+++ b/drivers/isdn/hisax/avma1_cs.c
@@ -123,11 +123,10 @@ static int avma1cs_probe(struct pcmcia_device *p_dev)
     DEBUG(0, "avma1cs_attach()\n");
 
     /* Allocate space for private device-specific data */
-    local = kmalloc(sizeof(local_info_t), GFP_KERNEL);
+    local = kzalloc(sizeof(local_info_t), GFP_KERNEL);
     if (!local)
         return -ENOMEM;
 
-    memset(local, 0, sizeof(local_info_t));
     p_dev->priv = local;
 
     /* The io structure describes IO port mapping */
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c
index cede72cdbb31..17ec0b70ba1d 100644
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
@@ -227,14 +227,6 @@ const char *CardType[] = {
 #define DEFAULT_CFG {5,0x2E0,0,0}
 #endif
 
-
-#ifdef CONFIG_HISAX_AMD7930
-#undef DEFAULT_CARD
-#undef DEFAULT_CFG
-#define DEFAULT_CARD ISDN_CTYPE_AMD7930
-#define DEFAULT_CFG {12,0x3e0,0,0}
-#endif
-
 #ifdef CONFIG_HISAX_NICCY
 #undef DEFAULT_CARD
 #undef DEFAULT_CFG
@@ -545,10 +537,6 @@ extern int setup_hfcpci(struct IsdnCard *card);
 extern int setup_hfcsx(struct IsdnCard *card);
 #endif
 
-#if CARD_AMD7930
-extern int setup_amd7930(struct IsdnCard *card);
-#endif
-
 #if CARD_NICCY
 extern int setup_niccy(struct IsdnCard *card);
 #endif
@@ -869,14 +857,13 @@ static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockow
         struct IsdnCard *card = cards + cardnr;
         struct IsdnCardState *cs;
 
-        cs = kmalloc(sizeof(struct IsdnCardState), GFP_ATOMIC);
+        cs = kzalloc(sizeof(struct IsdnCardState), GFP_ATOMIC);
         if (!cs) {
                 printk(KERN_WARNING
                        "HiSax: No memory for IsdnCardState(card %d)\n",
                        cardnr + 1);
                 goto out;
         }
-        memset(cs, 0, sizeof(struct IsdnCardState));
         card->cs = cs;
         spin_lock_init(&cs->statlock);
         spin_lock_init(&cs->lock);
@@ -1064,11 +1051,6 @@ static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockow
                 ret = setup_niccy(card);
                 break;
 #endif
-#if CARD_AMD7930
-        case ISDN_CTYPE_AMD7930:
-                ret = setup_amd7930(card);
-                break;
-#endif
 #if CARD_ISURF
         case ISDN_CTYPE_ISURF:
                 ret = setup_isurf(card);
@@ -1437,7 +1419,6 @@ static int __init HiSax_init(void)
                         break;
                 case ISDN_CTYPE_ELSA_PCI:
                 case ISDN_CTYPE_NETJET_S:
-                case ISDN_CTYPE_AMD7930:
                 case ISDN_CTYPE_TELESPCI:
                 case ISDN_CTYPE_W6692:
                 case ISDN_CTYPE_NETJET_U:
diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c
index 3dacfff93f5f..6eebeb441bfd 100644
--- a/drivers/isdn/hisax/diva.c
+++ b/drivers/isdn/hisax/diva.c
@@ -1121,7 +1121,11 @@ setup_diva(struct IsdnCard *card)
                         bytecnt = 32;
                 }
         }
+
+#ifdef __ISAPNP__
 ready:
+#endif
+
         printk(KERN_INFO
                 "Diva: %s card configured at %#lx IRQ %d\n",
                 (cs->subtyp == DIVA_PCI) ? "PCI" :
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c
index 4e180d210faa..79ab9dda7d08 100644
--- a/drivers/isdn/hisax/elsa_cs.c
+++ b/drivers/isdn/hisax/elsa_cs.c
@@ -146,9 +146,8 @@ static int elsa_cs_probe(struct pcmcia_device *link)
     DEBUG(0, "elsa_cs_attach()\n");
 
     /* Allocate space for private device-specific data */
-    local = kmalloc(sizeof(local_info_t), GFP_KERNEL);
+    local = kzalloc(sizeof(local_info_t), GFP_KERNEL);
     if (!local) return -ENOMEM;
-    memset(local, 0, sizeof(local_info_t));
 
     local->p_dev = link;
     link->priv = local;
diff --git a/drivers/isdn/hisax/fsm.c b/drivers/isdn/hisax/fsm.c
index 0d44a3f480ac..34fade96a581 100644
--- a/drivers/isdn/hisax/fsm.c
+++ b/drivers/isdn/hisax/fsm.c
@@ -26,12 +26,10 @@ FsmNew(struct Fsm *fsm, struct FsmNode *fnlist, int fncount)
         int i;
 
         fsm->jumpmatrix = (FSMFNPTR *)
-                kmalloc(sizeof (FSMFNPTR) * fsm->state_count * fsm->event_count, GFP_KERNEL);
+                kzalloc(sizeof (FSMFNPTR) * fsm->state_count * fsm->event_count, GFP_KERNEL);
         if (!fsm->jumpmatrix)
                 return -ENOMEM;
 
-        memset(fsm->jumpmatrix, 0, sizeof (FSMFNPTR) * fsm->state_count * fsm->event_count);
-
         for (i = 0; i < fncount; i++) 
                 if ((fnlist[i].state>=fsm->state_count) || (fnlist[i].event>=fsm->event_count)) {
                         printk(KERN_ERR "FsmNew Error line %d st(%ld/%ld) ev(%ld/%ld)\n",
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c
index de9b1a4d6bac..a2fa4ecb8c88 100644
--- a/drivers/isdn/hisax/hfc4s8s_l1.c
+++ b/drivers/isdn/hisax/hfc4s8s_l1.c
@@ -1591,11 +1591,10 @@ hfc4s8s_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         hfc4s8s_param *driver_data = (hfc4s8s_param *) ent->driver_data;
         hfc4s8s_hw *hw;
 
-        if (!(hw = kmalloc(sizeof(hfc4s8s_hw), GFP_ATOMIC))) {
+        if (!(hw = kzalloc(sizeof(hfc4s8s_hw), GFP_ATOMIC))) {
                 printk(KERN_ERR "No kmem for HFC-4S/8S card\n");
                 return (err);
         }
-        memset(hw, 0, sizeof(hfc4s8s_hw));
 
         hw->pdev = pdev;
         err = pci_enable_device(pdev);
diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c
index 5db0a85b827f..8a48a3ce0a55 100644
--- a/drivers/isdn/hisax/hfc_pci.c
+++ b/drivers/isdn/hisax/hfc_pci.c
@@ -1211,7 +1211,7 @@ HFCPCI_l1hw(struct PStack *st, int pr, void *arg)
                         break;
                 case (HW_TESTLOOP | REQUEST):
                         spin_lock_irqsave(&cs->lock, flags);
-                        switch ((int) arg) {
+                        switch ((long) arg) {
                                 case (1):
                                         Write_hfc(cs, HFCPCI_B1_SSL, 0x80);     /* tx slot */
                                         Write_hfc(cs, HFCPCI_B1_RSL, 0x80);     /* rx slot */
@@ -1229,7 +1229,7 @@ HFCPCI_l1hw(struct PStack *st, int pr, void *arg)
                                 default:
                                         spin_unlock_irqrestore(&cs->lock, flags);
                                         if (cs->debug & L1_DEB_WARN)
-                                                debugl1(cs, "hfcpci_l1hw loop invalid %4x", (int) arg);
+                                                debugl1(cs, "hfcpci_l1hw loop invalid %4lx", (long) arg);
                                         return;
                         }
                         cs->hw.hfcpci.trm |= 0x80;      /* enable IOM-loop */
@@ -1711,9 +1711,9 @@ setup_hfcpci(struct IsdnCard *card)
                 pci_write_config_dword(cs->hw.hfcpci.dev, 0x80, (u_int) virt_to_bus(cs->hw.hfcpci.fifos));
                 cs->hw.hfcpci.pci_io = ioremap((ulong) cs->hw.hfcpci.pci_io, 256);
                 printk(KERN_INFO
-                       "HFC-PCI: defined at mem %#x fifo %#x(%#x) IRQ %d HZ %d\n",
-                       (u_int) cs->hw.hfcpci.pci_io,
-                       (u_int) cs->hw.hfcpci.fifos,
+                       "HFC-PCI: defined at mem %p fifo %p(%#x) IRQ %d HZ %d\n",
+                       cs->hw.hfcpci.pci_io,
+                       cs->hw.hfcpci.fifos,
                        (u_int) virt_to_bus(cs->hw.hfcpci.fifos),
                        cs->irq, HZ);
                 spin_lock_irqsave(&cs->lock, flags);
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c
index 7105b043add8..5a6989f23fcf 100644
--- a/drivers/isdn/hisax/hfc_usb.c
+++ b/drivers/isdn/hisax/hfc_usb.c
@@ -1481,9 +1481,8 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                         iface = iface_used;
                         if (!
                             (context =
-                             kmalloc(sizeof(hfcusb_data), GFP_KERNEL)))
+                             kzalloc(sizeof(hfcusb_data), GFP_KERNEL)))
                                 return (-ENOMEM);       /* got no mem */
-                        memset(context, 0, sizeof(hfcusb_data));
 
                         ep = iface->endpoint;
                         vcf = validconf[small_match];
diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h
index 159c5896061e..3f1137e34678 100644
--- a/drivers/isdn/hisax/hisax.h
+++ b/drivers/isdn/hisax/hisax.h
@@ -1139,12 +1139,6 @@ struct IsdnCardState {
 #define  CARD_HFC_SX 0
 #endif
 
-#ifdef  CONFIG_HISAX_AMD7930
-#define CARD_AMD7930 1
-#else
-#define CARD_AMD7930 0
-#endif
-
 #ifdef  CONFIG_HISAX_NICCY
 #define CARD_NICCY 1
 #ifndef ISDN_CHIP_ISAC
diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index f6db55a752c4..9e088fce8c3a 100644
--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -841,12 +841,10 @@ new_adapter(void)
         struct hisax_b_if *b_if[2];
         int i;
 
-        adapter = kmalloc(sizeof(struct fritz_adapter), GFP_KERNEL);
+        adapter = kzalloc(sizeof(struct fritz_adapter), GFP_KERNEL);
         if (!adapter)
                 return NULL;
 
-        memset(adapter, 0, sizeof(struct fritz_adapter));
-
         adapter->isac.hisax_d_if.owner = THIS_MODULE;
         adapter->isac.hisax_d_if.ifc.priv = &adapter->isac;
         adapter->isac.hisax_d_if.ifc.l2l1 = isac_d_l2l1;
diff --git a/drivers/isdn/hisax/hisax_isac.c b/drivers/isdn/hisax/hisax_isac.c
index 81eac344bb03..d0fefcf999cb 100644
--- a/drivers/isdn/hisax/hisax_isac.c
+++ b/drivers/isdn/hisax/hisax_isac.c
@@ -433,7 +433,7 @@ static void l1m_debug(struct FsmInst *fi, char *fmt, ...)
         char buf[256];
         
         va_start(args, fmt);
-        vsprintf(buf, fmt, args);
+        vsnprintf(buf, sizeof(buf), fmt, args);
         DBG(DBG_L1M, "%s", buf);
         va_end(args);
 }
diff --git a/drivers/isdn/hisax/isdnhdlc.c b/drivers/isdn/hisax/isdnhdlc.c
index cbdf54c5af84..268dced6c34a 100644
--- a/drivers/isdn/hisax/isdnhdlc.c
+++ b/drivers/isdn/hisax/isdnhdlc.c
@@ -35,30 +35,6 @@ MODULE_LICENSE("GPL");
 
 /*-------------------------------------------------------------------*/
 
-/* bit swap table.
- * Very handy for devices with different bit order,
- * and neccessary for each transparent B-channel access for all
- * devices which works with this HDLC decoder without bit reversal.
- */
-const unsigned char isdnhdlc_bit_rev_tab[256] = {
-        0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0,
-        0x08,0x88,0x48,0xC8,0x28,0xA8,0x68,0xE8,0x18,0x98,0x58,0xD8,0x38,0xB8,0x78,0xF8,
-        0x04,0x84,0x44,0xC4,0x24,0xA4,0x64,0xE4,0x14,0x94,0x54,0xD4,0x34,0xB4,0x74,0xF4,
-        0x0C,0x8C,0x4C,0xCC,0x2C,0xAC,0x6C,0xEC,0x1C,0x9C,0x5C,0xDC,0x3C,0xBC,0x7C,0xFC,
-        0x02,0x82,0x42,0xC2,0x22,0xA2,0x62,0xE2,0x12,0x92,0x52,0xD2,0x32,0xB2,0x72,0xF2,
-        0x0A,0x8A,0x4A,0xCA,0x2A,0xAA,0x6A,0xEA,0x1A,0x9A,0x5A,0xDA,0x3A,0xBA,0x7A,0xFA,
-        0x06,0x86,0x46,0xC6,0x26,0xA6,0x66,0xE6,0x16,0x96,0x56,0xD6,0x36,0xB6,0x76,0xF6,
-        0x0E,0x8E,0x4E,0xCE,0x2E,0xAE,0x6E,0xEE,0x1E,0x9E,0x5E,0xDE,0x3E,0xBE,0x7E,0xFE,
-        0x01,0x81,0x41,0xC1,0x21,0xA1,0x61,0xE1,0x11,0x91,0x51,0xD1,0x31,0xB1,0x71,0xF1,
-        0x09,0x89,0x49,0xC9,0x29,0xA9,0x69,0xE9,0x19,0x99,0x59,0xD9,0x39,0xB9,0x79,0xF9,
-        0x05,0x85,0x45,0xC5,0x25,0xA5,0x65,0xE5,0x15,0x95,0x55,0xD5,0x35,0xB5,0x75,0xF5,
-        0x0D,0x8D,0x4D,0xCD,0x2D,0xAD,0x6D,0xED,0x1D,0x9D,0x5D,0xDD,0x3D,0xBD,0x7D,0xFD,
-        0x03,0x83,0x43,0xC3,0x23,0xA3,0x63,0xE3,0x13,0x93,0x53,0xD3,0x33,0xB3,0x73,0xF3,
-        0x0B,0x8B,0x4B,0xCB,0x2B,0xAB,0x6B,0xEB,0x1B,0x9B,0x5B,0xDB,0x3B,0xBB,0x7B,0xFB,
-        0x07,0x87,0x47,0xC7,0x27,0xA7,0x67,0xE7,0x17,0x97,0x57,0xD7,0x37,0xB7,0x77,0xF7,
-        0x0F,0x8F,0x4F,0xCF,0x2F,0xAF,0x6F,0xEF,0x1F,0x9F,0x5F,0xDF,0x3F,0xBF,0x7F,0xFF
-};
-
 enum {
         HDLC_FAST_IDLE,HDLC_GET_FLAG_B0,HDLC_GETFLAG_B1A6,HDLC_GETFLAG_B7,
         HDLC_GET_DATA,HDLC_FAST_FLAG
@@ -621,7 +597,6 @@ int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const unsigned char *src,
         return len;
 }
 
-EXPORT_SYMBOL(isdnhdlc_bit_rev_tab);
 EXPORT_SYMBOL(isdnhdlc_rcv_init);
 EXPORT_SYMBOL(isdnhdlc_decode);
 EXPORT_SYMBOL(isdnhdlc_out_init);
diff --git a/drivers/isdn/hisax/isdnhdlc.h b/drivers/isdn/hisax/isdnhdlc.h
index 5655b5f9c48e..45167d2f8fb0 100644
--- a/drivers/isdn/hisax/isdnhdlc.h
+++ b/drivers/isdn/hisax/isdnhdlc.h
@@ -57,8 +57,6 @@ struct isdnhdlc_vars {
 #define HDLC_CRC_ERROR         2
 #define HDLC_LENGTH_ERROR      3
 
-extern const unsigned char isdnhdlc_bit_rev_tab[256];
-
 extern void isdnhdlc_rcv_init (struct isdnhdlc_vars *hdlc, int do_adapt56);
 
 extern int isdnhdlc_decode (struct isdnhdlc_vars *hdlc, const unsigned char *src, int slen,int *count,
diff --git a/drivers/isdn/hisax/sedlbauer.c b/drivers/isdn/hisax/sedlbauer.c
index 9522141f4351..030d1625c5c6 100644
--- a/drivers/isdn/hisax/sedlbauer.c
+++ b/drivers/isdn/hisax/sedlbauer.c
@@ -677,7 +677,11 @@ setup_sedlbauer(struct IsdnCard *card)
                 return (0);
 #endif /* CONFIG_PCI */
         }       
+
+#ifdef __ISAPNP__
 ready:  
+#endif
+
         /* In case of the sedlbauer pcmcia card, this region is in use,
          * reserved for us by the card manager. So we do not check it
          * here, it would fail.
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c
index 46ed65334c51..45debde05fbd 100644
--- a/drivers/isdn/hisax/sedlbauer_cs.c
+++ b/drivers/isdn/hisax/sedlbauer_cs.c
@@ -155,9 +155,8 @@ static int sedlbauer_probe(struct pcmcia_device *link)
     DEBUG(0, "sedlbauer_attach()\n");
 
     /* Allocate space for private device-specific data */
-    local = kmalloc(sizeof(local_info_t), GFP_KERNEL);
+    local = kzalloc(sizeof(local_info_t), GFP_KERNEL);
     if (!local) return -ENOMEM;
-    memset(local, 0, sizeof(local_info_t));
     local->cardnr = -1;
 
     local->p_dev = link;
diff --git a/drivers/isdn/hisax/st5481_b.c b/drivers/isdn/hisax/st5481_b.c
index 75d0f248e4ee..fa64115cd7c7 100644
--- a/drivers/isdn/hisax/st5481_b.c
+++ b/drivers/isdn/hisax/st5481_b.c
@@ -14,6 +14,7 @@
 #include <linux/usb.h>
 #include <linux/slab.h>
 #include <linux/netdevice.h>
+#include <linux/bitrev.h>
 #include "st5481.h"
 
 static inline void B_L1L2(struct st5481_bcs *bcs, int pr, void *arg)
@@ -72,7 +73,7 @@ static void usb_b_out(struct st5481_bcs *bcs,int buf_nr)
                                         register unsigned char *dest = urb->transfer_buffer+len;
                                         register unsigned int count;
                                         for (count = 0; count < bytes_sent; count++)
-                                                *dest++ = isdnhdlc_bit_rev_tab[*src++];
+                                                *dest++ = bitrev8(*src++);
                                 }
                                 len += bytes_sent;
                         } else {
diff --git a/drivers/isdn/hisax/st5481_d.c b/drivers/isdn/hisax/st5481_d.c
index 1d8c2618366c..b8c4855cc889 100644
--- a/drivers/isdn/hisax/st5481_d.c
+++ b/drivers/isdn/hisax/st5481_d.c
@@ -173,7 +173,7 @@ static void l1m_debug(struct FsmInst *fi, char *fmt, ...)
         char buf[256];
         
         va_start(args, fmt);
-        vsprintf(buf, fmt, args);
+        vsnprintf(buf, sizeof(buf), fmt, args);
         DBG(8, "%s", buf);
         va_end(args);
 }
@@ -275,7 +275,7 @@ static void dout_debug(struct FsmInst *fi, char *fmt, ...)
         char buf[256];
         
         va_start(args, fmt);
-        vsprintf(buf, fmt, args);
+        vsnprintf(buf, sizeof(buf), fmt, args);
         DBG(0x2, "%s", buf);
         va_end(args);
 }
diff --git a/drivers/isdn/hisax/st5481_init.c b/drivers/isdn/hisax/st5481_init.c
index 2716aa5c60f7..bb3a28a53ff4 100644
--- a/drivers/isdn/hisax/st5481_init.c
+++ b/drivers/isdn/hisax/st5481_init.c
@@ -69,12 +69,10 @@ static int probe_st5481(struct usb_interface *intf,
              le16_to_cpu(dev->descriptor.idProduct),
              number_of_leds);
 
-        adapter = kmalloc(sizeof(struct st5481_adapter), GFP_KERNEL);
+        adapter = kzalloc(sizeof(struct st5481_adapter), GFP_KERNEL);
         if (!adapter)
                 return -ENOMEM;
 
-        memset(adapter, 0, sizeof(struct st5481_adapter));
-
         adapter->number_of_leds = number_of_leds;
         adapter->usb_dev = dev;
 
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c
index 6b754f183796..3e3e18239ec7 100644
--- a/drivers/isdn/hisax/teles_cs.c
+++ b/drivers/isdn/hisax/teles_cs.c
@@ -137,9 +137,8 @@ static int teles_probe(struct pcmcia_device *link)
     DEBUG(0, "teles_attach()\n");
 
     /* Allocate space for private device-specific data */
-    local = kmalloc(sizeof(local_info_t), GFP_KERNEL);
+    local = kzalloc(sizeof(local_info_t), GFP_KERNEL);
     if (!local) return -ENOMEM;
-    memset(local, 0, sizeof(local_info_t));
     local->cardnr = -1;
 
     local->p_dev = link;
diff --git a/drivers/isdn/hysdn/hycapi.c b/drivers/isdn/hysdn/hycapi.c
index 6bac43cc91bd..b2ae4ec1e49e 100644
--- a/drivers/isdn/hysdn/hycapi.c
+++ b/drivers/isdn/hysdn/hycapi.c
@@ -745,12 +745,11 @@ hycapi_capi_create(hysdn_card *card)
                 return 1;
         }
         if (!card->hyctrlinfo) {
-                cinfo = (hycapictrl_info *) kmalloc(sizeof(hycapictrl_info), GFP_ATOMIC);
+                cinfo = kzalloc(sizeof(hycapictrl_info), GFP_ATOMIC);
                 if (!cinfo) {
                         printk(KERN_WARNING "HYSDN: no memory for capi-ctrl.\n");
                         return -ENOMEM;
                 }
-                memset(cinfo, 0, sizeof(hycapictrl_info));
                 card->hyctrlinfo = cinfo;
                 cinfo->card = card;
                 spin_lock_init(&cinfo->lock);
diff --git a/drivers/isdn/hysdn/hysdn_boot.c b/drivers/isdn/hysdn/hysdn_boot.c
index 6d0eb0f42fca..be787e16bb79 100644
--- a/drivers/isdn/hysdn/hysdn_boot.c
+++ b/drivers/isdn/hysdn/hysdn_boot.c
@@ -278,14 +278,13 @@ pof_write_open(hysdn_card * card, unsigned char **bufp)
                 return (-ERR_ALREADY_BOOT);     /* boot already active */
         }
         /* error no mem available */
-        if (!(boot = kmalloc(sizeof(struct boot_data), GFP_KERNEL))) {
+        if (!(boot = kzalloc(sizeof(struct boot_data), GFP_KERNEL))) {
                 if (card->debug_flags & LOG_MEM_ERR)
                         hysdn_addlog(card, "POF open: unable to allocate mem");
                 return (-EFAULT);
         }
         card->boot = boot;
         card->state = CARD_STATE_BOOTING;
-        memset(boot, 0, sizeof(struct boot_data));
 
         card->stopcard(card);   /* first stop the card */
         if (card->testram(card)) {
diff --git a/drivers/isdn/hysdn/hysdn_init.c b/drivers/isdn/hysdn/hysdn_init.c
index b702ed27252b..9e01748a176e 100644
--- a/drivers/isdn/hysdn/hysdn_init.c
+++ b/drivers/isdn/hysdn/hysdn_init.c
@@ -81,11 +81,10 @@ search_cards(void)
                 if (pci_enable_device(akt_pcidev))
                         continue;
 
-                if (!(card = kmalloc(sizeof(hysdn_card), GFP_KERNEL))) {
+                if (!(card = kzalloc(sizeof(hysdn_card), GFP_KERNEL))) {
                         printk(KERN_ERR "HYSDN: unable to alloc device mem \n");
                         return;
                 }
-                memset(card, 0, sizeof(hysdn_card));
                 card->myid = cardmax;   /* set own id */
                 card->bus = akt_pcidev->bus->number;
                 card->devfn = akt_pcidev->devfn;        /* slot + function */
diff --git a/drivers/isdn/hysdn/hysdn_net.c b/drivers/isdn/hysdn/hysdn_net.c
index d205249a1242..557d96c78a62 100644
--- a/drivers/isdn/hysdn/hysdn_net.c
+++ b/drivers/isdn/hysdn/hysdn_net.c
@@ -278,11 +278,10 @@ hysdn_net_create(hysdn_card * card)
                 return (-ENOMEM);
         }
         hysdn_net_release(card);        /* release an existing net device */
-        if ((dev = kmalloc(sizeof(struct net_local), GFP_KERNEL)) == NULL) {
+        if ((dev = kzalloc(sizeof(struct net_local), GFP_KERNEL)) == NULL) {
                 printk(KERN_WARNING "HYSDN: unable to allocate mem\n");
                 return (-ENOMEM);
         }
-        memset(dev, 0, sizeof(struct net_local));       /* clean the structure */
 
         spin_lock_init(&((struct net_local *) dev)->lock);
 
diff --git a/drivers/isdn/hysdn/hysdn_proclog.c b/drivers/isdn/hysdn/hysdn_proclog.c
index fcd49920b220..f241f5e551cb 100644
--- a/drivers/isdn/hysdn/hysdn_proclog.c
+++ b/drivers/isdn/hysdn/hysdn_proclog.c
@@ -204,7 +204,7 @@ hysdn_log_read(struct file *file, char __user *buf, size_t count, loff_t * off)
 {
         struct log_data *inf;
         int len;
-        struct proc_dir_entry *pde = PDE(file->f_dentry->d_inode);
+        struct proc_dir_entry *pde = PDE(file->f_path.dentry->d_inode);
         struct procdata *pd = NULL;
         hysdn_card *card;
 
@@ -354,7 +354,7 @@ static unsigned int
 hysdn_log_poll(struct file *file, poll_table * wait)
 {
         unsigned int mask = 0;
-        struct proc_dir_entry *pde = PDE(file->f_dentry->d_inode);
+        struct proc_dir_entry *pde = PDE(file->f_path.dentry->d_inode);
         hysdn_card *card;
         struct procdata *pd = NULL;
 
@@ -405,8 +405,7 @@ hysdn_proclog_init(hysdn_card * card)
 
         /* create a cardlog proc entry */
 
-        if ((pd = (struct procdata *) kmalloc(sizeof(struct procdata), GFP_KERNEL)) != NULL) {
-                memset(pd, 0, sizeof(struct procdata));
+        if ((pd = kzalloc(sizeof(struct procdata), GFP_KERNEL)) != NULL) {
                 sprintf(pd->log_name, "%s%d", PROC_LOG_BASENAME, card->myid);
                 if ((pd->log = create_proc_entry(pd->log_name, S_IFREG | S_IRUGO | S_IWUSR, hysdn_proc_entry)) != NULL) {
                         pd->log->proc_fops = &log_fops; 
diff --git a/drivers/isdn/i4l/isdn_bsdcomp.c b/drivers/isdn/i4l/isdn_bsdcomp.c
index 0afe442db3b0..a20f33b4a220 100644
--- a/drivers/isdn/i4l/isdn_bsdcomp.c
+++ b/drivers/isdn/i4l/isdn_bsdcomp.c
@@ -331,12 +331,10 @@ static void *bsd_alloc (struct isdn_ppp_comp_data *data)
          * Allocate the main control structure for this instance.
          */
         maxmaxcode = MAXCODE(bits);
-        db = (struct bsd_db *) kmalloc (sizeof (struct bsd_db),GFP_KERNEL);
+        db = kzalloc (sizeof (struct bsd_db),GFP_KERNEL);
         if (!db)
                 return NULL;
 
-        memset (db, 0, sizeof(struct bsd_db));
-
         db->xmit = data->flags & IPPP_COMP_FLAG_XMIT;
         decomp = db->xmit ? 0 : 1;
 
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index 69aee2602aa6..6a2ef0a87ed9 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -1059,7 +1059,7 @@ isdn_info_update(void)
 static ssize_t
 isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off)
 {
-        uint minor = iminor(file->f_dentry->d_inode);
+        uint minor = iminor(file->f_path.dentry->d_inode);
         int len = 0;
         int drvidx;
         int chidx;
@@ -1166,7 +1166,7 @@ isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off)
 static ssize_t
 isdn_write(struct file *file, const char __user *buf, size_t count, loff_t * off)
 {
-        uint minor = iminor(file->f_dentry->d_inode);
+        uint minor = iminor(file->f_path.dentry->d_inode);
         int drvidx;
         int chidx;
         int retval;
@@ -1228,7 +1228,7 @@ static unsigned int
 isdn_poll(struct file *file, poll_table * wait)
 {
         unsigned int mask = 0;
-        unsigned int minor = iminor(file->f_dentry->d_inode);
+        unsigned int minor = iminor(file->f_path.dentry->d_inode);
         int drvidx = isdn_minor2drv(minor - ISDN_MINOR_CTRL);
 
         lock_kernel();
@@ -2072,21 +2072,19 @@ isdn_add_channels(isdn_driver_t *d, int drvidx, int n, int adding)
 
         if ((adding) && (d->rcverr))
                 kfree(d->rcverr);
-        if (!(d->rcverr = kmalloc(sizeof(int) * m, GFP_ATOMIC))) {
+        if (!(d->rcverr = kzalloc(sizeof(int) * m, GFP_ATOMIC))) {
                 printk(KERN_WARNING "register_isdn: Could not alloc rcverr\n");
                 return -1;
         }
-        memset((char *) d->rcverr, 0, sizeof(int) * m);
 
         if ((adding) && (d->rcvcount))
                 kfree(d->rcvcount);
-        if (!(d->rcvcount = kmalloc(sizeof(int) * m, GFP_ATOMIC))) {
+        if (!(d->rcvcount = kzalloc(sizeof(int) * m, GFP_ATOMIC))) {
                 printk(KERN_WARNING "register_isdn: Could not alloc rcvcount\n");
                 if (!adding)
                         kfree(d->rcverr);
                 return -1;
         }
-        memset((char *) d->rcvcount, 0, sizeof(int) * m);
 
         if ((adding) && (d->rpqueue)) {
                 for (j = 0; j < d->channels; j++)
@@ -2226,11 +2224,10 @@ register_isdn(isdn_if * i)
                 printk(KERN_WARNING "register_isdn: No write routine given.\n");
                 return 0;
         }
-        if (!(d = kmalloc(sizeof(isdn_driver_t), GFP_KERNEL))) {
+        if (!(d = kzalloc(sizeof(isdn_driver_t), GFP_KERNEL))) {
                 printk(KERN_WARNING "register_isdn: Could not alloc driver-struct\n");
                 return 0;
         }
-        memset((char *) d, 0, sizeof(isdn_driver_t));
 
         d->maxbufsize = i->maxbufsize;
         d->pktcount = 0;
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index 2e4daebfb7e0..c36c817578cb 100644
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -2542,17 +2542,15 @@ isdn_net_new(char *name, struct net_device *master)
                 printk(KERN_WARNING "isdn_net: interface %s already exists\n", name);
                 return NULL;
         }
-        if (!(netdev = (isdn_net_dev *) kmalloc(sizeof(isdn_net_dev), GFP_KERNEL))) {
+        if (!(netdev = kzalloc(sizeof(isdn_net_dev), GFP_KERNEL))) {
                 printk(KERN_WARNING "isdn_net: Could not allocate net-device\n");
                 return NULL;
         }
-        memset(netdev, 0, sizeof(isdn_net_dev));
-        if (!(netdev->local = (isdn_net_local *) kmalloc(sizeof(isdn_net_local), GFP_KERNEL))) {
+        if (!(netdev->local = kzalloc(sizeof(isdn_net_local), GFP_KERNEL))) {
                 printk(KERN_WARNING "isdn_net: Could not allocate device locals\n");
                 kfree(netdev);
                 return NULL;
         }
-        memset(netdev->local, 0, sizeof(isdn_net_local));
         if (name == NULL)
                 strcpy(netdev->local->name, "         ");
         else
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index 119412d6bd15..43811795b46b 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -667,7 +667,7 @@ isdn_ppp_poll(struct file *file, poll_table * wait)
 
         if (is->debug & 0x2)
                 printk(KERN_DEBUG "isdn_ppp_poll: minor: %d\n",
-                                iminor(file->f_dentry->d_inode));
+                                iminor(file->f_path.dentry->d_inode));
 
         /* just registers wait_queue hook. This doesn't really wait. */
         poll_wait(file, &is->wq, wait);
@@ -876,14 +876,12 @@ isdn_ppp_init(void)
 #endif /* CONFIG_ISDN_MPP */
 
         for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
-                if (!(ippp_table[i] = (struct ippp_struct *)
-                      kmalloc(sizeof(struct ippp_struct), GFP_KERNEL))) {
+                if (!(ippp_table[i] = kzalloc(sizeof(struct ippp_struct), GFP_KERNEL))) {
                         printk(KERN_WARNING "isdn_ppp_init: Could not alloc ippp_table\n");
                         for (j = 0; j < i; j++)
                                 kfree(ippp_table[j]);
                         return -1;
                 }
-                memset((char *) ippp_table[i], 0, sizeof(struct ippp_struct));
                 spin_lock_init(&ippp_table[i]->buflock);
                 ippp_table[i]->state = 0;
                 ippp_table[i]->first = ippp_table[i]->rq + NUM_RCV_BUFFS - 1;
@@ -1529,10 +1527,8 @@ static int isdn_ppp_mp_bundle_array_init(void)
 {
         int i;
         int sz = ISDN_MAX_CHANNELS*sizeof(ippp_bundle);
-        if( (isdn_ppp_bundle_arr = (ippp_bundle*)kmalloc(sz, 
-                                                        GFP_KERNEL)) == NULL )
+        if( (isdn_ppp_bundle_arr = kzalloc(sz, GFP_KERNEL)) == NULL )
                 return -ENOMEM;
-        memset(isdn_ppp_bundle_arr, 0, sz);
         for( i = 0; i < ISDN_MAX_CHANNELS; i++ )
                 spin_lock_init(&isdn_ppp_bundle_arr[i].lock);
         return 0;
@@ -2246,13 +2242,12 @@ static void isdn_ppp_ccp_xmit_reset(struct ippp_struct *is, int proto,
 static struct ippp_ccp_reset *isdn_ppp_ccp_reset_alloc(struct ippp_struct *is)
 {
         struct ippp_ccp_reset *r;
-        r = kmalloc(sizeof(struct ippp_ccp_reset), GFP_KERNEL);
+        r = kzalloc(sizeof(struct ippp_ccp_reset), GFP_KERNEL);
         if(!r) {
                 printk(KERN_ERR "ippp_ccp: failed to allocate reset data"
                        " structure - no mem\n");
                 return NULL;
         }
-        memset(r, 0, sizeof(struct ippp_ccp_reset));
         printk(KERN_DEBUG "ippp_ccp: allocated reset data structure %p\n", r);
         is->reset = r;
         return r;
@@ -2338,10 +2333,9 @@ static struct ippp_ccp_reset_state *isdn_ppp_ccp_reset_alloc_state(struct ippp_s
                        id);
                 return NULL;
         } else {
-                rs = kmalloc(sizeof(struct ippp_ccp_reset_state), GFP_KERNEL);
+                rs = kzalloc(sizeof(struct ippp_ccp_reset_state), GFP_KERNEL);
                 if(!rs)
                         return NULL;
-                memset(rs, 0, sizeof(struct ippp_ccp_reset_state));
                 rs->state = CCPResetIdle;
                 rs->is = is;
                 rs->id = id;
@@ -2536,6 +2530,11 @@ static struct sk_buff *isdn_ppp_decompress(struct sk_buff *skb,struct ippp_struc
                 rsparm.maxdlen = IPPP_RESET_MAXDATABYTES;
   
                 skb_out = dev_alloc_skb(is->mru + PPP_HDRLEN);
+                if (!skb_out) {
+                        kfree_skb(skb);
+                        printk(KERN_ERR "ippp: decomp memory allocation failure\n");
+                        return NULL;
+                }
                 len = ipc->decompress(stat, skb, skb_out, &rsparm);
                 kfree_skb(skb);
                 if (len <= 0) {
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index 2b91bb07fc7f..fc80afe555b9 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -1464,7 +1464,7 @@ isdn_tty_ioctl(struct tty_struct *tty, struct file *file,
 }
 
 static void
-isdn_tty_set_termios(struct tty_struct *tty, struct termios *old_termios)
+isdn_tty_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 {
         modem_info *info = (modem_info *) tty->driver_data;
 
diff --git a/drivers/isdn/i4l/isdn_v110.c b/drivers/isdn/i4l/isdn_v110.c
index 38619e8cd823..5484d3c38a57 100644
--- a/drivers/isdn/i4l/isdn_v110.c
+++ b/drivers/isdn/i4l/isdn_v110.c
@@ -92,9 +92,8 @@ isdn_v110_open(unsigned char key, int hdrlen, int maxsize)
         int i;
         isdn_v110_stream *v;
 
-        if ((v = kmalloc(sizeof(isdn_v110_stream), GFP_ATOMIC)) == NULL)
+        if ((v = kzalloc(sizeof(isdn_v110_stream), GFP_ATOMIC)) == NULL)
                 return NULL;
-        memset(v, 0, sizeof(isdn_v110_stream));
         v->key = key;
         v->nbits = 0;
         for (i = 0; key & (1 << i); i++)
diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
index 730bbd07ebc7..1e699bcaba0f 100644
--- a/drivers/isdn/icn/icn.c
+++ b/drivers/isdn/icn/icn.c
@@ -1519,12 +1519,11 @@ icn_initcard(int port, char *id)
         icn_card *card;
         int i;
 
-        if (!(card = (icn_card *) kmalloc(sizeof(icn_card), GFP_KERNEL))) {
+        if (!(card = kzalloc(sizeof(icn_card), GFP_KERNEL))) {
                 printk(KERN_WARNING
                        "icn: (%s) Could not allocate card-struct.\n", id);
                 return (icn_card *) 0;
         }
-        memset((char *) card, 0, sizeof(icn_card));
         spin_lock_init(&card->lock);
         card->port = port;
         card->interface.owner = THIS_MODULE;
diff --git a/drivers/isdn/isdnloop/isdnloop.c b/drivers/isdn/isdnloop/isdnloop.c
index c3ae2edaf6fa..e3add27dd0e1 100644
--- a/drivers/isdn/isdnloop/isdnloop.c
+++ b/drivers/isdn/isdnloop/isdnloop.c
@@ -1430,12 +1430,11 @@ isdnloop_initcard(char *id)
         isdnloop_card *card;
         int i;
 
-        if (!(card = (isdnloop_card *) kmalloc(sizeof(isdnloop_card), GFP_KERNEL))) {
+        if (!(card = kzalloc(sizeof(isdnloop_card), GFP_KERNEL))) {
                 printk(KERN_WARNING
                  "isdnloop: (%s) Could not allocate card-struct.\n", id);
                 return (isdnloop_card *) 0;
         }
-        memset((char *) card, 0, sizeof(isdnloop_card));
         card->interface.owner = THIS_MODULE;
         card->interface.channels = ISDNLOOP_BCH;
         card->interface.hl_hdrlen  = 1; /* scratch area for storing ack flag*/ 
diff --git a/drivers/isdn/pcbit/drv.c b/drivers/isdn/pcbit/drv.c
index 1966f3410a13..11c1b0b6e390 100644
--- a/drivers/isdn/pcbit/drv.c
+++ b/drivers/isdn/pcbit/drv.c
@@ -73,14 +73,13 @@ int pcbit_init_dev(int board, int mem_base, int irq)
         struct pcbit_dev *dev;
         isdn_if *dev_if;
 
-        if ((dev=kmalloc(sizeof(struct pcbit_dev), GFP_KERNEL)) == NULL)
+        if ((dev=kzalloc(sizeof(struct pcbit_dev), GFP_KERNEL)) == NULL)
         {
                 printk("pcbit_init: couldn't malloc pcbit_dev struct\n");
                 return -ENOMEM;
         }
 
         dev_pcbit[board] = dev;
-        memset(dev, 0, sizeof(struct pcbit_dev));
         init_waitqueue_head(&dev->set_running_wq);
         spin_lock_init(&dev->lock);
 
@@ -104,7 +103,7 @@ int pcbit_init_dev(int board, int mem_base, int irq)
                 return -EACCES;
         }
 
-        dev->b1 = kmalloc(sizeof(struct pcbit_chan), GFP_KERNEL);
+        dev->b1 = kzalloc(sizeof(struct pcbit_chan), GFP_KERNEL);
         if (!dev->b1) {
                 printk("pcbit_init: couldn't malloc pcbit_chan struct\n");
                 iounmap(dev->sh_mem);
@@ -113,7 +112,7 @@ int pcbit_init_dev(int board, int mem_base, int irq)
                 return -ENOMEM;
         }
     
-        dev->b2 = kmalloc(sizeof(struct pcbit_chan), GFP_KERNEL);
+        dev->b2 = kzalloc(sizeof(struct pcbit_chan), GFP_KERNEL);
         if (!dev->b2) {
                 printk("pcbit_init: couldn't malloc pcbit_chan struct\n");
                 kfree(dev->b1);
@@ -123,8 +122,6 @@ int pcbit_init_dev(int board, int mem_base, int irq)
                 return -ENOMEM;
         }
 
-        memset(dev->b1, 0, sizeof(struct pcbit_chan));
-        memset(dev->b2, 0, sizeof(struct pcbit_chan));
         dev->b2->id = 1;
 
         INIT_WORK(&dev->qdelivery, pcbit_deliver);
diff --git a/drivers/isdn/pcbit/layer2.c b/drivers/isdn/pcbit/layer2.c
index 0c9f6df873fc..6ff85574e941 100644
--- a/drivers/isdn/pcbit/layer2.c
+++ b/drivers/isdn/pcbit/layer2.c
@@ -369,13 +369,12 @@ pcbit_receive(struct pcbit_dev *dev)
                         kfree(dev->read_frame);
                         dev->read_frame = NULL;
                 }
-                frame = kmalloc(sizeof(struct frame_buf), GFP_ATOMIC);
+                frame = kzalloc(sizeof(struct frame_buf), GFP_ATOMIC);
 
                 if (frame == NULL) {
                         printk(KERN_WARNING "kmalloc failed\n");
                         return;
                 }
-                memset(frame, 0, sizeof(struct frame_buf));
 
                 cpu = pcbit_readb(dev);
                 proc = pcbit_readb(dev);
diff --git a/drivers/isdn/sc/init.c b/drivers/isdn/sc/init.c
index 06c9872e8c6a..150759a5cddf 100644
--- a/drivers/isdn/sc/init.c
+++ b/drivers/isdn/sc/init.c
@@ -271,14 +271,13 @@ static int __init sc_init(void)
                  * Horray! We found a board, Make sure we can register
                  * it with ISDN4Linux
                  */
-                interface = kmalloc(sizeof(isdn_if), GFP_KERNEL);
+                interface = kzalloc(sizeof(isdn_if), GFP_KERNEL);
                 if (interface == NULL) {
                         /*
                          * Oops, can't malloc isdn_if
                          */
                         continue;
                 }
-                memset(interface, 0, sizeof(isdn_if));
 
                 interface->owner = THIS_MODULE;
                 interface->hl_hdrlen = 0;
@@ -294,7 +293,7 @@ static int __init sc_init(void)
                 /*
                  * Allocate the board structure
                  */
-                sc_adapter[cinst] = kmalloc(sizeof(board), GFP_KERNEL);
+                sc_adapter[cinst] = kzalloc(sizeof(board), GFP_KERNEL);
                 if (sc_adapter[cinst] == NULL) {
                         /*
                          * Oops, can't alloc memory for the board
@@ -302,7 +301,6 @@ static int __init sc_init(void)
                         kfree(interface);
                         continue;
                 }
-                memset(sc_adapter[cinst], 0, sizeof(board));
                 spin_lock_init(&sc_adapter[cinst]->lock);
 
                 if(!register_isdn(interface)) {
@@ -326,7 +324,7 @@ static int __init sc_init(void)
                 /*
                  * Allocate channels status structures
                  */
-                sc_adapter[cinst]->channel = kmalloc(sizeof(bchan) * channels, GFP_KERNEL);
+                sc_adapter[cinst]->channel = kzalloc(sizeof(bchan) * channels, GFP_KERNEL);
                 if (sc_adapter[cinst]->channel == NULL) {
                         /*
                          * Oops, can't alloc memory for the channels
@@ -336,7 +334,6 @@ static int __init sc_init(void)
                         kfree(sc_adapter[cinst]);
                         continue;
                 }
-                memset(sc_adapter[cinst]->channel, 0, sizeof(bchan) * channels);
 
                 /*
                  * Lock down the hardware resources