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 / hisax / isurf.c

diff --git a/drivers/isdn/hisax/isurf.c b/drivers/isdn/hisax/isurf.c
index c2759f7..33747af 100644 (file)
--- a/drivers/isdn/hisax/isurf.c
+++ b/drivers/isdn/hisax/isurf.c
@@ -122,11 +122,11 @@ isurf_interrupt(int intno, void *dev_id, struct pt_regs *regs)
        return IRQ_HANDLED;
 }
 
-void
+static void
 release_io_isurf(struct IsdnCardState *cs)
 {
        release_region(cs->hw.isurf.reset, 1);
-       iounmap((unsigned char *)cs->hw.isurf.isar);
+       iounmap(cs->hw.isurf.isar);
        release_mem_region(cs->hw.isurf.phymem, ISURF_IOMEM_SIZE);
 }
 
@@ -272,8 +272,7 @@ setup_isurf(struct IsdnCard *card)
                release_region(cs->hw.isurf.reset, 1);
                return (0);
        }
-       cs->hw.isurf.isar =
-               (unsigned long) ioremap(cs->hw.isurf.phymem, ISURF_IOMEM_SIZE);
+       cs->hw.isurf.isar = ioremap(cs->hw.isurf.phymem, ISURF_IOMEM_SIZE);
        cs->hw.isurf.isac = cs->hw.isurf.isar + ISURF_ISAC_OFFSET;
        printk(KERN_INFO
               "ISurf: defined at 0x%x 0x%lx IRQ %d\n",