fedora core 6 1.2949 + vserver 2.2.0

[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..55de069 100644 (file)
--- a/drivers/isdn/hisax/isurf.c
+++ b/drivers/isdn/hisax/isurf.c
@@ -83,7 +83,7 @@ WriteISAR(struct IsdnCardState *cs, int mode, u_char offset, u_char value)
 }
 
 static irqreturn_t
-isurf_interrupt(int intno, void *dev_id, struct pt_regs *regs)
+isurf_interrupt(int intno, void *dev_id)
 {
        struct IsdnCardState *cs = dev_id;
        u_char val;
@@ -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);
 }
 
@@ -196,10 +196,10 @@ isurf_auxcmd(struct IsdnCardState *cs, isdn_ctrl *ic) {
 }
 
 #ifdef __ISAPNP__
-static struct pnp_card *pnp_c __initdata = NULL;
+static struct pnp_card *pnp_c __devinitdata = NULL;
 #endif
 
-int __init
+int __devinit
 setup_isurf(struct IsdnCard *card)
 {
        int ver;
@@ -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",