[PATCH] parport_cs: don't play games with resources
Dominik Brodowski [Sun, 15 Jan 2006 07:30:40 +0000 (08:30 +0100)]
pcmcia_request_io() doesn't mark the resource as busy in 2.6., therefore
there's no need to work around the registration of the resources into the
resource tree.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

drivers/parport/parport_cs.c

index 158d925..d0fc8be 100644 (file)
@@ -226,9 +226,6 @@ void parport_config(dev_link_t *link)
     CS_CHECK(RequestIRQ, pcmcia_request_irq(handle, &link->irq));
     CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));
 
-    release_region(link->io.BasePort1, link->io.NumPorts1);
-    if (link->io.NumPorts2)
-       release_region(link->io.BasePort2, link->io.NumPorts2);
     p = parport_pc_probe_port(link->io.BasePort1, link->io.BasePort2,
                              link->irq.AssignedIRQ, PARPORT_DMA_NONE,
                              NULL);
@@ -277,11 +274,6 @@ void parport_cs_release(dev_link_t *link)
     if (info->ndev) {
        struct parport *p = info->port;
        parport_pc_unregister_port(p);
-       request_region(link->io.BasePort1, link->io.NumPorts1,
-                      info->node.dev_name);
-       if (link->io.NumPorts2)
-           request_region(link->io.BasePort2, link->io.NumPorts2,
-                          info->node.dev_name);
     }
     info->ndev = 0;
     link->dev = NULL;