pcmcia: re-work pcmcia_request_irq()

[pandora-kernel.git] / drivers / char / pcmcia / ipwireless / main.c

diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c
index dff24da..2237890 100644 (file)
--- a/drivers/char/pcmcia/ipwireless/main.c
+++ b/drivers/char/pcmcia/ipwireless/main.c
@@ -195,9 +195,6 @@ static int config_ipwireless(struct ipw_dev *ipw)
        link->conf.Attributes = CONF_ENABLE_IRQ;
        link->conf.IntType = INT_MEMORY_AND_IO;
 
-       link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
-       link->irq.Handler = ipwireless_interrupt;
-
        INIT_WORK(&ipw->work_reboot, signalled_reboot_work);
 
        ipwireless_init_hardware_v1(ipw->hardware, link->io.BasePort1,
@@ -205,8 +202,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
                                    ipw->is_v2_card, signalled_reboot_callback,
                                    ipw);
 
-       ret = pcmcia_request_irq(link, &link->irq);
-
+       ret = pcmcia_request_irq(link, ipwireless_interrupt);
        if (ret != 0)
                goto exit;
 
@@ -217,7 +213,7 @@ static int config_ipwireless(struct ipw_dev *ipw)
                        (unsigned int) link->io.BasePort1,
                        (unsigned int) (link->io.BasePort1 +
                                link->io.NumPorts1 - 1),
-                       (unsigned int) link->irq.AssignedIRQ);
+                       (unsigned int) link->irq);
        if (ipw->attr_memory && ipw->common_memory)
                printk(KERN_INFO IPWIRELESS_PCCARD_NAME
                        ": attr memory 0x%08lx-0x%08lx, common memory 0x%08lx-0x%08lx\n",
@@ -271,8 +267,6 @@ exit:
 
 static void release_ipwireless(struct ipw_dev *ipw)
 {
-       pcmcia_disable_device(ipw->link);
-
        if (ipw->common_memory) {
                release_mem_region(ipw->request_common_memory.Base,
                                ipw->request_common_memory.Size);
@@ -288,7 +282,6 @@ static void release_ipwireless(struct ipw_dev *ipw)
        if (ipw->attr_memory)
                pcmcia_release_window(ipw->link, ipw->handle_attr_memory);
 
-       /* Break the link with Card Services */
        pcmcia_disable_device(ipw->link);
 }