Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / isdn / pcbit / drv.c

diff --git a/drivers/isdn/pcbit/drv.c b/drivers/isdn/pcbit/drv.c
index c3f43a5..94f2148 100644 (file)
--- a/drivers/isdn/pcbit/drv.c
+++ b/drivers/isdn/pcbit/drv.c
@@ -56,10 +56,10 @@ static char* pcbit_devname[MAX_PCBIT_CARDS] = {
  * prototypes
  */
 
-int pcbit_command(isdn_ctrl* ctl);
-int pcbit_stat(u_char* buf, int len, int user, int, int);
-int pcbit_xmit(int driver, int chan, int ack, struct sk_buff *skb);
-int pcbit_writecmd(const u_char*, int, int, int, int);
+static int pcbit_command(isdn_ctrl* ctl);
+static int pcbit_stat(u_char __user * buf, int len, int, int);
+static int pcbit_xmit(int driver, int chan, int ack, struct sk_buff *skb);
+static int pcbit_writecmd(const u_char __user *, int, int, int);
 
 static int set_protocol_running(struct pcbit_dev * dev);
 
@@ -96,7 +96,7 @@ int pcbit_init_dev(int board, int mem_base, int irq)
                        dev_pcbit[board] = NULL;
                        return -EACCES;
                }
-               dev->sh_mem = (unsigned char*)ioremap(dev->ph_mem, 4096);
+               dev->sh_mem = ioremap(dev->ph_mem, 4096);
        }
        else 
        {
@@ -109,7 +109,7 @@ int pcbit_init_dev(int board, int mem_base, int irq)
        dev->b1 = kmalloc(sizeof(struct pcbit_chan), GFP_KERNEL);
        if (!dev->b1) {
                printk("pcbit_init: couldn't malloc pcbit_chan struct\n");
-               iounmap((unsigned char*)dev->sh_mem);
+               iounmap(dev->sh_mem);
                release_mem_region(dev->ph_mem, 4096);
                kfree(dev);
                return -ENOMEM;
@@ -119,7 +119,7 @@ int pcbit_init_dev(int board, int mem_base, int irq)
        if (!dev->b2) {
                printk("pcbit_init: couldn't malloc pcbit_chan struct\n");
                kfree(dev->b1);
-               iounmap((unsigned char*)dev->sh_mem);
+               iounmap(dev->sh_mem);
                release_mem_region(dev->ph_mem, 4096);
                kfree(dev);
                return -ENOMEM;
@@ -139,7 +139,7 @@ int pcbit_init_dev(int board, int mem_base, int irq)
        {
                kfree(dev->b1);
                kfree(dev->b2);
-               iounmap((unsigned char*)dev->sh_mem);
+               iounmap(dev->sh_mem);
                release_mem_region(dev->ph_mem, 4096);
                kfree(dev);
                dev_pcbit[board] = NULL;
@@ -161,7 +161,7 @@ int pcbit_init_dev(int board, int mem_base, int irq)
                free_irq(irq, dev);
                kfree(dev->b1);
                kfree(dev->b2);
-               iounmap((unsigned char*)dev->sh_mem);
+               iounmap(dev->sh_mem);
                release_mem_region(dev->ph_mem, 4096);
                kfree(dev);
                dev_pcbit[board] = NULL;
@@ -193,7 +193,7 @@ int pcbit_init_dev(int board, int mem_base, int irq)
                free_irq(irq, dev);
                kfree(dev->b1);
                kfree(dev->b2);
-               iounmap((unsigned char*)dev->sh_mem);
+               iounmap(dev->sh_mem);
                release_mem_region(dev->ph_mem, 4096);
                kfree(dev);
                dev_pcbit[board] = NULL;
@@ -231,14 +231,14 @@ void pcbit_terminate(int board)
                        del_timer(&dev->b2->fsm_timer);
                kfree(dev->b1);
                kfree(dev->b2);
-               iounmap((unsigned char*)dev->sh_mem);
+               iounmap(dev->sh_mem);
                release_mem_region(dev->ph_mem, 4096);
                kfree(dev);
        }
 }
 #endif
 
-int pcbit_command(isdn_ctrl* ctl)
+static int pcbit_command(isdn_ctrl* ctl)
 {
        struct pcbit_dev  *dev;
        struct pcbit_chan *chan;
@@ -330,7 +330,7 @@ static void pcbit_block_timer(unsigned long data)
 }
 #endif
 
-int pcbit_xmit(int driver, int chnum, int ack, struct sk_buff *skb)
+static int pcbit_xmit(int driver, int chnum, int ack, struct sk_buff *skb)
 {
        ushort hdrlen;
        int refnum, len;
@@ -389,12 +389,13 @@ int pcbit_xmit(int driver, int chnum, int ack, struct sk_buff *skb)
        return len;
 }
 
-int pcbit_writecmd(const u_char* buf, int len, int user, int driver, int channel)
+static int pcbit_writecmd(const u_char __user *buf, int len, int driver, int channel)
 {
        struct pcbit_dev * dev;
        int i, j;
        const u_char * loadbuf;
        u_char * ptr = NULL;
+       u_char *cbuf;
 
        int errstat;
 
@@ -415,37 +416,28 @@ int pcbit_writecmd(const u_char* buf, int len, int user, int driver, int channel
                        return -EINVAL;
                }
 
-               if (user)
-               {
-                       u_char *cbuf = kmalloc(len, GFP_KERNEL);
-                       if (!cbuf)
-                               return -ENOMEM;
+               cbuf = kmalloc(len, GFP_KERNEL);
+               if (!cbuf)
+                       return -ENOMEM;
 
-                       if (copy_from_user(cbuf, buf, len)) {
-                               kfree(cbuf);
-                               return -EFAULT;
-                       }
-                       memcpy_toio(dev->sh_mem, cbuf, len);
+               if (copy_from_user(cbuf, buf, len)) {
                        kfree(cbuf);
+                       return -EFAULT;
                }
-               else
-                       memcpy_toio(dev->sh_mem, buf, len);
+               memcpy_toio(dev->sh_mem, cbuf, len);
+               kfree(cbuf);
                return len;
        case L2_FWMODE:
                /* this is the hard part */
                /* dumb board */
-               if (user) {             
-                       /* get it into kernel space */
-                       if ((ptr = kmalloc(len, GFP_KERNEL))==NULL)
-                               return -ENOMEM;
-                       if (copy_from_user(ptr, buf, len)) {
-                               kfree(ptr);
-                               return -EFAULT;
-                       }
-                       loadbuf = ptr;
+               /* get it into kernel space */
+               if ((ptr = kmalloc(len, GFP_KERNEL))==NULL)
+                       return -ENOMEM;
+               if (copy_from_user(ptr, buf, len)) {
+                       kfree(ptr);
+                       return -EFAULT;
                }
-               else
-                       loadbuf = buf;
+               loadbuf = ptr;
     
                errstat = 0;
 
@@ -468,9 +460,7 @@ int pcbit_writecmd(const u_char* buf, int len, int user, int driver, int channel
                        if (dev->loadptr > LOAD_ZONE_END)
                                dev->loadptr = LOAD_ZONE_START;
                }
-
-               if (user)
-                       kfree(ptr);
+               kfree(ptr);
 
                return errstat ? errstat : len;
        default:
@@ -571,10 +561,8 @@ void pcbit_l3_receive(struct pcbit_dev * dev, ulong msg,
                else
                        pcbit_fsm_event(dev, chan, EV_USR_RELEASE_REQ, NULL);
 
-               if (cbdata.data.setup.CalledPN)
-                       kfree(cbdata.data.setup.CalledPN);
-               if (cbdata.data.setup.CallingPN)
-                       kfree(cbdata.data.setup.CallingPN);
+               kfree(cbdata.data.setup.CalledPN);
+               kfree(cbdata.data.setup.CallingPN);
                break;
     
        case MSG_CONN_CONF:
@@ -723,17 +711,7 @@ static char statbuf[STATBUF_LEN];
 static int stat_st = 0;
 static int stat_end = 0;
 
-
-static __inline void
-memcpy_to_COND(int flag, char *d, const char *s, int len) {
-       if (flag)
-               copy_to_user(d, s, len);
-       else
-               memcpy(d, s, len);
-}
-
-
-int pcbit_stat(u_char* buf, int len, int user, int driver, int channel)
+static int pcbit_stat(u_char __user *buf, int len, int driver, int channel)
 {
        int stat_count;
        stat_count = stat_end - stat_st;
@@ -747,24 +725,23 @@ int pcbit_stat(u_char* buf, int len, int user, int driver, int channel)
 
        if (stat_st < stat_end)
        {
-               memcpy_to_COND(user, buf, statbuf + stat_st, len);
+               copy_to_user(buf, statbuf + stat_st, len);
                stat_st += len;    
        }
        else
        {
                if (len > STATBUF_LEN - stat_st)
                {
-                       memcpy_to_COND(user, buf, statbuf + stat_st, 
+                       copy_to_user(buf, statbuf + stat_st, 
                                       STATBUF_LEN - stat_st);
-                       memcpy_to_COND(user, buf, statbuf, 
+                       copy_to_user(buf, statbuf, 
                                       len - (STATBUF_LEN - stat_st));
 
                        stat_st = len - (STATBUF_LEN - stat_st);
                }
                else
                {
-                       memcpy_to_COND(user, buf, statbuf + stat_st, 
-                                      len);
+                       copy_to_user(buf, statbuf + stat_st, len);
 
                        stat_st += len;
                        
@@ -880,7 +857,7 @@ static int set_protocol_running(struct pcbit_dev * dev)
                printk(KERN_DEBUG "Bank3 = %02x\n", 
                       readb(dev->sh_mem + BANK3));
 #endif
-               *(dev->sh_mem + BANK4) = 0x40U;
+               writeb(0x40, dev->sh_mem + BANK4);
 
                /* warn the upper layer */
                ctl.driver = dev->id;