From fde749988c0e7ceacdce5c48a78940ee74217e2b Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Sat, 10 Jul 2004 19:30:57 -0700 Subject: [PATCH] [PATCH] remove dead isdn pcmcia code The _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: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/isdn/hisax/elsa_cs.c | 17 ----------------- drivers/isdn/hisax/teles_cs.c | 17 ----------------- 2 files changed, 34 deletions(-) diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c index f957e5731a79e..0c198804ea0b3 100644 --- a/drivers/isdn/hisax/elsa_cs.c +++ b/drivers/isdn/hisax/elsa_cs.c @@ -271,19 +271,6 @@ static void elsa_cs_detach(dev_link_t *link) if (link->state & DEV_CONFIG) 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 */ if (link->handle) { ret = pcmcia_deregister_client(link->handle); @@ -480,10 +467,6 @@ static void elsa_cs_release(dev_link_t *link) pcmcia_release_io(link->handle, &link->io); pcmcia_release_irq(link->handle, &link->irq); link->state &= ~DEV_CONFIG; - - if (link->state & DEV_STALE_LINK) - elsa_cs_detach(link); - } /* elsa_cs_release */ /*====================================================================== diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c index 98f8e2848f37f..74b89d8a11b37 100644 --- a/drivers/isdn/hisax/teles_cs.c +++ b/drivers/isdn/hisax/teles_cs.c @@ -252,19 +252,6 @@ static void teles_detach(dev_link_t *link) if (link->state & DEV_CONFIG) 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 */ if (link->handle) { ret = pcmcia_deregister_client(link->handle); @@ -461,10 +448,6 @@ static void teles_cs_release(dev_link_t *link) pcmcia_release_io(link->handle, &link->io); pcmcia_release_irq(link->handle, &link->irq); link->state &= ~DEV_CONFIG; - - if (link->state & DEV_STALE_LINK) - teles_detach(link); - } /* teles_cs_release */ /*====================================================================== -- 2.53.0