Commit fde74998 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds

[PATCH] remove dead isdn pcmcia code

The <driver>_config function called just before clear DEV_CONFIG, and
DEV_STALE_LINK isn't set anywhere else.  This is a copy & paste thing found
in all old pcmcia drivers.

The patch has been sent to the isdn list ages ago but I didn't get any
response.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 49a83003
...@@ -271,19 +271,6 @@ static void elsa_cs_detach(dev_link_t *link) ...@@ -271,19 +271,6 @@ static void elsa_cs_detach(dev_link_t *link)
if (link->state & DEV_CONFIG) if (link->state & DEV_CONFIG)
elsa_cs_release(link); elsa_cs_release(link);
/*
If the device is currently configured and active, we won't
actually delete it yet. Instead, it is marked so that when
the release() function is called, that will trigger a proper
detach().
*/
if (link->state & DEV_CONFIG) {
DEBUG(0, "elsa_cs: detach postponed, '%s' "
"still locked\n", link->dev->dev_name);
link->state |= DEV_STALE_LINK;
return;
}
/* Break the link with Card Services */ /* Break the link with Card Services */
if (link->handle) { if (link->handle) {
ret = pcmcia_deregister_client(link->handle); ret = pcmcia_deregister_client(link->handle);
...@@ -480,10 +467,6 @@ static void elsa_cs_release(dev_link_t *link) ...@@ -480,10 +467,6 @@ static void elsa_cs_release(dev_link_t *link)
pcmcia_release_io(link->handle, &link->io); pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq); pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG; link->state &= ~DEV_CONFIG;
if (link->state & DEV_STALE_LINK)
elsa_cs_detach(link);
} /* elsa_cs_release */ } /* elsa_cs_release */
/*====================================================================== /*======================================================================
......
...@@ -252,19 +252,6 @@ static void teles_detach(dev_link_t *link) ...@@ -252,19 +252,6 @@ static void teles_detach(dev_link_t *link)
if (link->state & DEV_CONFIG) if (link->state & DEV_CONFIG)
teles_cs_release(link); teles_cs_release(link);
/*
If the device is currently configured and active, we won't
actually delete it yet. Instead, it is marked so that when
the release() function is called, that will trigger a proper
detach().
*/
if (link->state & DEV_CONFIG) {
DEBUG(0, "teles_cs: detach postponed, '%s' "
"still locked\n", link->dev->dev_name);
link->state |= DEV_STALE_LINK;
return;
}
/* Break the link with Card Services */ /* Break the link with Card Services */
if (link->handle) { if (link->handle) {
ret = pcmcia_deregister_client(link->handle); ret = pcmcia_deregister_client(link->handle);
...@@ -461,10 +448,6 @@ static void teles_cs_release(dev_link_t *link) ...@@ -461,10 +448,6 @@ static void teles_cs_release(dev_link_t *link)
pcmcia_release_io(link->handle, &link->io); pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq); pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG; link->state &= ~DEV_CONFIG;
if (link->state & DEV_STALE_LINK)
teles_detach(link);
} /* teles_cs_release */ } /* teles_cs_release */
/*====================================================================== /*======================================================================
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment