Merge branch 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

[pandora-kernel.git] / drivers / pcmcia / hd64465_ss.c

diff --git a/drivers/pcmcia/hd64465_ss.c b/drivers/pcmcia/hd64465_ss.c
index ad02629..fb2bc1f 100644 (file)
--- a/drivers/pcmcia/hd64465_ss.c
+++ b/drivers/pcmcia/hd64465_ss.c
@@ -1,6 +1,4 @@
 /*
- * $Id: hd64465_ss.c,v 1.7 2003/07/06 14:42:50 lethal Exp $
- *
  * Device driver for the PCMCIA controller module of the
  * Hitachi HD64465 handheld companion chip.
  *
@@ -48,7 +46,6 @@
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>
 #include <pcmcia/ss.h>
-#include <pcmcia/bulkmem.h>
 #include "cs_internal.h"
 
 #define MODNAME "hd64465_ss"
@@ -650,7 +647,7 @@ static int hs_set_mem_map(struct pcmcia_socket *s, struct pccard_mem_map *mem)
  */
 static int hs_irq_demux(int irq, void *dev)
 {
-       hs_socket_t *sp = (hs_socket_t *)dev;
+       hs_socket_t *sp = dev;
        u_int cscr;
        
        DPRINTK("hs_irq_demux(irq=%d)\n", irq);
@@ -671,13 +668,12 @@ static int hs_irq_demux(int irq, void *dev)
  * Interrupt handling routine.
  */
  
-static irqreturn_t hs_interrupt(int irq, void *dev, struct pt_regs *regs)
+static irqreturn_t hs_interrupt(int irq, void *dev)
 {
-       hs_socket_t *sp = (hs_socket_t *)dev;
+       hs_socket_t *sp = dev;
        u_int events = 0;
        u_int cscr;
-       
-       
+
        cscr = hs_in(sp, CSCR);
        
        DPRINTK("hs_interrupt, cscr=%04x\n", cscr);
@@ -908,7 +904,7 @@ static int __init init_hs(void)
 
        for (i=0; i<HS_MAX_SOCKETS; i++) {
                unsigned int ret;
-               hs_sockets[i].socket.dev.dev = &hd64465_device.dev;             
+               hs_sockets[i].socket.dev.parent = &hd64465_device.dev;
                hs_sockets[i].number = i;
                ret = pcmcia_register_socket(&hs_sockets[i].socket);
                if (ret && i)