From 57758ee061f5b0cf54499de91e49523ac365b603 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Sat, 6 Sep 2003 22:55:57 +0100 Subject: [PATCH] [PCMCIA] kill dead DEV_STALE_* codepathes in non-networking drivers I guess there was some overzealous copy & pasting going on.. --- drivers/char/pcmcia/synclink_cs.c | 8 -------- drivers/isdn/hardware/avm/avm_cs.c | 9 --------- drivers/isdn/hisax/avma1_cs.c | 12 ------------ drivers/isdn/hisax/elsa_cs.c | 12 ------------ drivers/isdn/hisax/sedlbauer_cs.c | 12 ------------ 5 files changed, 53 deletions(-) diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index e14a3ce8928d3..e06e10ed4f378 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c @@ -725,14 +725,6 @@ static void mgslpc_release(u_long arg) if (debug_level >= DEBUG_LEVEL_INFO) printk("mgslpc_release(0x%p)\n", link); - if (link->open) { - if (debug_level >= DEBUG_LEVEL_INFO) - printk("synclink_cs: release postponed, '%s' still open\n", - link->dev->dev_name); - link->state |= DEV_STALE_CONFIG; - return; - } - /* Unlink the device chain */ link->dev = NULL; link->state &= ~DEV_CONFIG; diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c index 0fdab51567b59..2767ba3752aa8 100644 --- a/drivers/isdn/hardware/avm/avm_cs.c +++ b/drivers/isdn/hardware/avm/avm_cs.c @@ -431,15 +431,6 @@ found_port: static void avmcs_release(dev_link_t *link) { - /* - If the device is currently in use, we won't release until it - is actually closed. - */ - if (link->open) { - link->state |= DEV_STALE_CONFIG; - return; - } - b1pcmcia_delcard(link->io.BasePort1, link->irq.AssignedIRQ); /* Unlink the device chain */ diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c index f502575b7aace..00fb0e14ae7e9 100644 --- a/drivers/isdn/hisax/avma1_cs.c +++ b/drivers/isdn/hisax/avma1_cs.c @@ -438,17 +438,6 @@ static void avma1cs_release(dev_link_t *link) DEBUG(0, "avma1cs_release(0x%p)\n", link); - /* - If the device is currently in use, we won't release until it - is actually closed. - */ - if (link->open) { - DEBUG(1, "avma1_cs: release postponed, '%s' still open\n", - link->dev->dev_name); - link->state |= DEV_STALE_CONFIG; - return; - } - /* no unregister function with hisax */ HiSax_closecard(local->node.minor); @@ -463,7 +452,6 @@ static void avma1cs_release(dev_link_t *link) if (link->state & DEV_STALE_LINK) avma1cs_detach(link); - } /* avma1cs_release */ /*====================================================================== diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c index 05b3548ad9eac..15233a4708dac 100644 --- a/drivers/isdn/hisax/elsa_cs.c +++ b/drivers/isdn/hisax/elsa_cs.c @@ -442,18 +442,6 @@ static void elsa_cs_release(dev_link_t *link) DEBUG(0, "elsa_cs_release(0x%p)\n", link); - /* - If the device is currently in use, we won't release until it - is actually closed, because until then, we can't be sure that - no one will try to access the device or its data structures. - */ - if (link->open) { - DEBUG(1, "elsa_cs: release postponed, '%s' " - "still open\n", link->dev->dev_name); - link->state |= DEV_STALE_CONFIG; - return; - } - /* Unlink the device chain */ link->dev = NULL; diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c index a73b16eefd58a..4c8d1dfb5d0f4 100644 --- a/drivers/isdn/hisax/sedlbauer_cs.c +++ b/drivers/isdn/hisax/sedlbauer_cs.c @@ -535,18 +535,6 @@ static void sedlbauer_release(dev_link_t *link) { DEBUG(0, "sedlbauer_release(0x%p)\n", link); - /* - If the device is currently in use, we won't release until it - is actually closed, because until then, we can't be sure that - no one will try to access the device or its data structures. - */ - if (link->open) { - DEBUG(1, "sedlbauer_cs: release postponed, '%s' still open\n", - link->dev->dev_name); - link->state |= DEV_STALE_CONFIG; - return; - } - /* Unlink the device chain */ link->dev = NULL; -- 2.53.0