vserver 1.9.5.x5

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

diff --git a/drivers/isdn/pcbit/drv.c b/drivers/isdn/pcbit/drv.c
index ed8af7f..e98f9c4 100644 (file)
--- a/drivers/isdn/pcbit/drv.c
+++ b/drivers/isdn/pcbit/drv.c
@@ -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,7 +231,7 @@ 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);
        }
@@ -859,7 +859,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;