diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-10-06 15:27:31 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-10-06 15:27:31 -0400 |
commit | 5d347c8abaab1e8c24272a53099c22482855783e (patch) | |
tree | 3e267ced787b4ae18dd2c6275c1b8a83884f96b6 /drivers/pcmcia/hd64465_ss.c | |
parent | e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67 (diff) | |
parent | d87dbede030d17770aa6a6170e70ab6f8044e5ae (diff) |
Merge branch 'submit1' of viper:/spare/repo/irq-remove-2.6 into irqcleanups
Diffstat (limited to 'drivers/pcmcia/hd64465_ss.c')
-rw-r--r-- | drivers/pcmcia/hd64465_ss.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/pcmcia/hd64465_ss.c b/drivers/pcmcia/hd64465_ss.c index db3c26b5de1..caca0dc9d30 100644 --- a/drivers/pcmcia/hd64465_ss.c +++ b/drivers/pcmcia/hd64465_ss.c @@ -650,7 +650,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); @@ -673,11 +673,10 @@ static int hs_irq_demux(int irq, void *dev) 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); |