mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-25 11:55:37 +00:00
Code Issues Releases Wiki Activity

[PATCH] pcmcia: add pcmcia_disable_device

Browse source 
pcmcia_disable_device(struct pcmcia_device *p_dev) performs the necessary
cleanups upon device or driver removal: it calls the appropriate
pcmcia_release_* functions, and can replace (most) of the current drivers'
_release() functions.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
Dominik Brodowski 2006-01-15 09:32:39 +01:00
parent 1de9cedfbd
commit 5f2a71fcb7
43 changed files with 153 additions and 401 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Documentation/pcmcia/driver-changes.txt
View file

@ -1,5 +1,11 @@
This file details changes in 2.6 which affect PCMCIA card driver authors: This file details changes in 2.6 which affect PCMCIA card driver authors:
* New release helper (as of 2.6.17)
Instead of calling pcmcia_release_{configuration,io,irq,win}, all that's
necessary now is calling pcmcia_disable_device. As there is no valid
reason left to call pcmcia_release_io and pcmcia_release_irq, they will
be removed soon.
* Unify detach and REMOVAL event code, as well as attach and INSERTION * Unify detach and REMOVAL event code, as well as attach and INSERTION
code (as of 2.6.16) code (as of 2.6.16)
void (*remove) (struct pcmcia_device *dev); void (*remove) (struct pcmcia_device *dev);

8
drivers/bluetooth/bluecard_cs.c
View file

@ -1002,13 +1002,7 @@ static void bluecard_release(dev_link_t *link)
del_timer(&(info->timer)); del_timer(&(info->timer));
link->dev = NULL; pcmcia_disable_device(link->handle);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
} }
static int bluecard_suspend(struct pcmcia_device *dev) static int bluecard_suspend(struct pcmcia_device *dev)

8
drivers/bluetooth/bt3c_cs.c
View file

@ -839,13 +839,7 @@ static void bt3c_release(dev_link_t *link)
if (link->state & DEV_PRESENT) if (link->state & DEV_PRESENT)
bt3c_close(info); bt3c_close(info);
link->dev = NULL; pcmcia_disable_device(link->handle);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
} }
static int bt3c_suspend(struct pcmcia_device *dev) static int bt3c_suspend(struct pcmcia_device *dev)

8
drivers/bluetooth/btuart_cs.c
View file

@ -768,13 +768,7 @@ static void btuart_release(dev_link_t *link)
if (link->state & DEV_PRESENT) if (link->state & DEV_PRESENT)
btuart_close(info); btuart_close(info);
link->dev = NULL; pcmcia_disable_device(link->handle);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
} }
static int btuart_suspend(struct pcmcia_device *dev) static int btuart_suspend(struct pcmcia_device *dev)

8
drivers/bluetooth/dtl1_cs.c
View file

@ -720,13 +720,7 @@ static void dtl1_release(dev_link_t *link)
if (link->state & DEV_PRESENT) if (link->state & DEV_PRESENT)
dtl1_close(info); dtl1_close(info);
link->dev = NULL; pcmcia_disable_device(link->handle);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
} }
static int dtl1_suspend(struct pcmcia_device *dev) static int dtl1_suspend(struct pcmcia_device *dev)

3
drivers/char/pcmcia/cm4000_cs.c
View file

@ -1899,8 +1899,7 @@ static int cm4000_resume(struct pcmcia_device *p_dev)
static void cm4000_release(dev_link_t *link) static void cm4000_release(dev_link_t *link)
{ {
cmm_cm4000_release(link->priv); /* delay release until device closed */ cmm_cm4000_release(link->priv); /* delay release until device closed */
pcmcia_release_configuration(link->handle); pcmcia_disable_device(link->handle);
pcmcia_release_io(link->handle, &link->io);
} }
static int cm4000_attach(struct pcmcia_device *p_dev) static int cm4000_attach(struct pcmcia_device *p_dev)

3
drivers/char/pcmcia/cm4040_cs.c
View file

@ -654,8 +654,7 @@ static int reader_resume(struct pcmcia_device *p_dev)
static void reader_release(dev_link_t *link) static void reader_release(dev_link_t *link)
{ {
cm4040_reader_release(link->priv); cm4040_reader_release(link->priv);
pcmcia_release_configuration(link->handle); pcmcia_disable_device(link->handle);
pcmcia_release_io(link->handle, &link->io);
} }
static int reader_attach(struct pcmcia_device *p_dev) static int reader_attach(struct pcmcia_device *p_dev)

10
drivers/char/pcmcia/synclink_cs.c
View file

@ -710,15 +710,7 @@ static void mgslpc_release(u_long arg)
if (debug_level >= DEBUG_LEVEL_INFO) if (debug_level >= DEBUG_LEVEL_INFO)
printk("mgslpc_release(0x%p)\n", link); printk("mgslpc_release(0x%p)\n", link);
/* Unlink the device chain */ pcmcia_disable_device(link->handle);
link->dev = NULL;
link->state &= ~DEV_CONFIG;
pcmcia_release_configuration(link->handle);
if (link->io.NumPorts1)
pcmcia_release_io(link->handle, &link->io);
if (link->irq.AssignedIRQ)
pcmcia_release_irq(link->handle, &link->irq);
} }
static void mgslpc_detach(struct pcmcia_device *p_dev) static void mgslpc_detach(struct pcmcia_device *p_dev)

8
drivers/ide/legacy/ide-cs.c
View file

@ -369,14 +369,8 @@ void ide_release(dev_link_t *link)
ide_unregister(info->hd); ide_unregister(info->hd);
} }
info->ndev = 0; info->ndev = 0;
link->dev = NULL;
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
pcmcia_disable_device(link->handle);
} /* ide_release */ } /* ide_release */
static int ide_suspend(struct pcmcia_device *dev) static int ide_suspend(struct pcmcia_device *dev)

12
drivers/isdn/hardware/avm/avm_cs.c
View file

@ -367,16 +367,8 @@ static void avmcs_config(dev_link_t *link)
static void avmcs_release(dev_link_t *link) static void avmcs_release(dev_link_t *link)
{ {
b1pcmcia_delcard(link->io.BasePort1, link->irq.AssignedIRQ); b1pcmcia_delcard(link->io.BasePort1, link->irq.AssignedIRQ);
pcmcia_disable_device(link->handle);
/* Unlink the device chain */
link->dev = NULL;
/* Don't bother checking to see if these succeed or not */
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
} /* avmcs_release */ } /* avmcs_release */
static int avmcs_suspend(struct pcmcia_device *dev) static int avmcs_suspend(struct pcmcia_device *dev)

17
drivers/isdn/hisax/avma1_cs.c
View file

@ -373,21 +373,14 @@ static void avma1cs_config(dev_link_t *link)
static void avma1cs_release(dev_link_t *link) static void avma1cs_release(dev_link_t *link)
{ {
local_info_t *local = link->priv; local_info_t *local = link->priv;
DEBUG(0, "avma1cs_release(0x%p)\n", link); DEBUG(0, "avma1cs_release(0x%p)\n", link);
/* no unregister function with hisax */ /* now unregister function with hisax */
HiSax_closecard(local->node.minor); HiSax_closecard(local->node.minor);
/* Unlink the device chain */ pcmcia_disable_device(link->handle);
link->dev = NULL;
/* Don't bother checking to see if these succeed or not */
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
} /* avma1cs_release */ } /* avma1cs_release */
static int avma1cs_suspend(struct pcmcia_device *dev) static int avma1cs_suspend(struct pcmcia_device *dev)

10
drivers/isdn/hisax/elsa_cs.c
View file

@ -380,16 +380,8 @@ static void elsa_cs_release(dev_link_t *link)
HiSax_closecard(local->cardnr); HiSax_closecard(local->cardnr);
} }
} }
/* Unlink the device chain */
link->dev = NULL;
/* Don't bother checking to see if these succeed or not */ pcmcia_disable_device(link->handle);
if (link->win)
pcmcia_release_window(link->win);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
} /* elsa_cs_release */ } /* elsa_cs_release */
static int elsa_suspend(struct pcmcia_device *p_dev) static int elsa_suspend(struct pcmcia_device *p_dev)

17
drivers/isdn/hisax/sedlbauer_cs.c
View file

@ -467,23 +467,8 @@ static void sedlbauer_release(dev_link_t *link)
HiSax_closecard(local->cardnr); HiSax_closecard(local->cardnr);
} }
} }
/* Unlink the device chain */
link->dev = NULL;
/* pcmcia_disable_device(link->handle);
In a normal driver, additional code may be needed to release
other kernel data structures associated with this device.
*/
/* Don't bother checking to see if these succeed or not */
if (link->win)
pcmcia_release_window(link->win);
pcmcia_release_configuration(link->handle);
if (link->io.NumPorts1)
pcmcia_release_io(link->handle, &link->io);
if (link->irq.AssignedIRQ)
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
} /* sedlbauer_release */ } /* sedlbauer_release */
static int sedlbauer_suspend(struct pcmcia_device *p_dev) static int sedlbauer_suspend(struct pcmcia_device *p_dev)

10
drivers/isdn/hisax/teles_cs.c
View file

@ -371,16 +371,8 @@ static void teles_cs_release(dev_link_t *link)
HiSax_closecard(local->cardnr); HiSax_closecard(local->cardnr);
} }
} }
/* Unlink the device chain */
link->dev = NULL;
/* Don't bother checking to see if these succeed or not */ pcmcia_disable_device(link->handle);
if (link->win)
pcmcia_release_window(link->win);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
} /* teles_cs_release */ } /* teles_cs_release */
static int teles_suspend(struct pcmcia_device *p_dev) static int teles_suspend(struct pcmcia_device *p_dev)

8
drivers/net/pcmcia/3c574_cs.c
View file

@ -511,13 +511,7 @@ static void tc574_config(dev_link_t *link)
static void tc574_release(dev_link_t *link) static void tc574_release(dev_link_t *link)
{ {
DEBUG(0, "3c574_release(0x%p)\n", link); pcmcia_disable_device(link->handle);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
} }
static int tc574_suspend(struct pcmcia_device *p_dev) static int tc574_suspend(struct pcmcia_device *p_dev)

8
drivers/net/pcmcia/3c589_cs.c
View file

@ -386,13 +386,7 @@ static void tc589_config(dev_link_t *link)
static void tc589_release(dev_link_t *link) static void tc589_release(dev_link_t *link)
{ {
DEBUG(0, "3c589_release(0x%p)\n", link); pcmcia_disable_device(link->handle);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
} }
static int tc589_suspend(struct pcmcia_device *p_dev) static int tc589_suspend(struct pcmcia_device *p_dev)

8
drivers/net/pcmcia/axnet_cs.c
View file

@ -456,13 +456,7 @@ static void axnet_config(dev_link_t *link)
static void axnet_release(dev_link_t *link) static void axnet_release(dev_link_t *link)
{ {
DEBUG(0, "axnet_release(0x%p)\n", link); pcmcia_disable_device(link->handle);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
} }
static int axnet_suspend(struct pcmcia_device *p_dev) static int axnet_suspend(struct pcmcia_device *p_dev)

12
drivers/net/pcmcia/com20020_cs.c
View file

@ -377,16 +377,8 @@ static void com20020_config(dev_link_t *link)
static void com20020_release(dev_link_t *link) static void com20020_release(dev_link_t *link)
{ {
DEBUG(0, "com20020_release(0x%p)\n", link);
DEBUG(1,"release...\n"); pcmcia_disable_device(link->handle);
DEBUG(0, "com20020_release(0x%p)\n", link);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~(DEV_CONFIG | DEV_RELEASE_PENDING);
} }
static int com20020_suspend(struct pcmcia_device *p_dev) static int com20020_suspend(struct pcmcia_device *p_dev)

12
drivers/net/pcmcia/fmvj18x_cs.c
View file

@ -674,16 +674,8 @@ static int fmvj18x_setup_mfc(dev_link_t *link)
static void fmvj18x_release(dev_link_t *link) static void fmvj18x_release(dev_link_t *link)
{ {
DEBUG(0, "fmvj18x_release(0x%p)\n", link);
DEBUG(0, "fmvj18x_release(0x%p)\n", link); pcmcia_disable_device(link->handle);
/* Don't bother checking to see if these succeed or not */
pcmcia_release_window(link->win);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
} }
static int fmvj18x_suspend(struct pcmcia_device *p_dev) static int fmvj18x_suspend(struct pcmcia_device *p_dev)

23
drivers/net/pcmcia/ibmtr_cs.c
View file

@ -348,22 +348,17 @@ static void ibmtr_config(dev_link_t *link)
static void ibmtr_release(dev_link_t *link) static void ibmtr_release(dev_link_t *link)
{ {
ibmtr_dev_t *info = link->priv; ibmtr_dev_t *info = link->priv;
struct net_device *dev = info->dev; struct net_device *dev = info->dev;
DEBUG(0, "ibmtr_release(0x%p)\n", link); DEBUG(0, "ibmtr_release(0x%p)\n", link);
pcmcia_release_configuration(link->handle); if (link->win) {
pcmcia_release_io(link->handle, &link->io); struct tok_info *ti = netdev_priv(dev);
pcmcia_release_irq(link->handle, &link->irq); iounmap(ti->mmio);
if (link->win) { pcmcia_release_window(info->sram_win_handle);
struct tok_info *ti = netdev_priv(dev); }
iounmap(ti->mmio); pcmcia_disable_device(link->handle);
pcmcia_release_window(link->win);
pcmcia_release_window(info->sram_win_handle);
}
link->state &= ~DEV_CONFIG;
} }
static int ibmtr_suspend(struct pcmcia_device *p_dev) static int ibmtr_suspend(struct pcmcia_device *p_dev)

10
drivers/net/pcmcia/nmclan_cs.c
View file

@ -765,14 +765,8 @@ nmclan_release
---------------------------------------------------------------------------- */ ---------------------------------------------------------------------------- */
static void nmclan_release(dev_link_t *link) static void nmclan_release(dev_link_t *link)
{ {
DEBUG(0, "nmclan_release(0x%p)\n", link);
DEBUG(0, "nmclan_release(0x%p)\n", link); pcmcia_disable_device(link->handle);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
} }
static int nmclan_suspend(struct pcmcia_device *p_dev) static int nmclan_suspend(struct pcmcia_device *p_dev)

15
drivers/net/pcmcia/pcnet_cs.c
View file

@ -732,19 +732,14 @@ static void pcnet_config(dev_link_t *link)
static void pcnet_release(dev_link_t *link) static void pcnet_release(dev_link_t *link)
{ {
pcnet_dev_t *info = PRIV(link->priv); pcnet_dev_t *info = PRIV(link->priv);
DEBUG(0, "pcnet_release(0x%p)\n", link); DEBUG(0, "pcnet_release(0x%p)\n", link);
if (info->flags & USE_SHMEM) { if (info->flags & USE_SHMEM)
iounmap(info->base); iounmap(info->base);
pcmcia_release_window(link->win);
}
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG; pcmcia_disable_device(link->handle);
} }
/*====================================================================== /*======================================================================

21
drivers/net/pcmcia/smc91c92_cs.c
View file

@ -1181,20 +1181,13 @@ static void smc91c92_config(dev_link_t *link)
static void smc91c92_release(dev_link_t *link) static void smc91c92_release(dev_link_t *link)
{ {
DEBUG(0, "smc91c92_release(0x%p)\n", link);
DEBUG(0, "smc91c92_release(0x%p)\n", link); if (link->win) {
struct net_device *dev = link->priv;
pcmcia_release_configuration(link->handle); struct smc_private *smc = netdev_priv(dev);
pcmcia_release_io(link->handle, &link->io); iounmap(smc->base);
pcmcia_release_irq(link->handle, &link->irq); }
if (link->win) { pcmcia_disable_device(link->handle);
struct net_device *dev = link->priv;
struct smc_private *smc = netdev_priv(dev);
iounmap(smc->base);
pcmcia_release_window(link->win);
}
link->state &= ~DEV_CONFIG;
} }
/*====================================================================== /*======================================================================

22
drivers/net/pcmcia/xirc2ps_cs.c
View file

@ -1090,21 +1090,15 @@ xirc2ps_config(dev_link_t * link)
static void static void
xirc2ps_release(dev_link_t *link) xirc2ps_release(dev_link_t *link)
{ {
DEBUG(0, "release(0x%p)\n", link);
DEBUG(0, "release(0x%p)\n", link); if (link->win) {
struct net_device *dev = link->priv;
if (link->win) { local_info_t *local = netdev_priv(dev);
struct net_device *dev = link->priv; if (local->dingo)
local_info_t *local = netdev_priv(dev); iounmap(local->dingo_ccr - 0x0800);
if (local->dingo) }
iounmap(local->dingo_ccr - 0x0800); pcmcia_disable_device(link->handle);
pcmcia_release_window(link->win);
}
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
} /* xirc2ps_release */ } /* xirc2ps_release */
/*====================================================================*/ /*====================================================================*/

19
drivers/net/wireless/airo_cs.c
View file

@ -429,24 +429,7 @@ static void airo_config(dev_link_t *link)
static void airo_release(dev_link_t *link) static void airo_release(dev_link_t *link)
{ {
DEBUG(0, "airo_release(0x%p)\n", link); DEBUG(0, "airo_release(0x%p)\n", link);
pcmcia_disable_device(link->handle);
/* Unlink the device chain */
link->dev = NULL;
/*
In a normal driver, additional code may be needed to release
other kernel data structures associated with this device.
*/
/* Don't bother checking to see if these succeed or not */
if (link->win)
pcmcia_release_window(link->win);
pcmcia_release_configuration(link->handle);
if (link->io.NumPorts1)
pcmcia_release_io(link->handle, &link->io);
if (link->irq.AssignedIRQ)
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
} }
static int airo_suspend(struct pcmcia_device *p_dev) static int airo_suspend(struct pcmcia_device *p_dev)

21
drivers/net/wireless/atmel_cs.c
View file

@ -418,23 +418,14 @@ static void atmel_config(dev_link_t *link)
static void atmel_release(dev_link_t *link) static void atmel_release(dev_link_t *link)
{ {
struct net_device *dev = ((local_info_t*)link->priv)->eth_dev; struct net_device *dev = ((local_info_t*)link->priv)->eth_dev;
DEBUG(0, "atmel_release(0x%p)\n", link); DEBUG(0, "atmel_release(0x%p)\n", link);
/* Unlink the device chain */ if (dev)
link->dev = NULL;
if (dev)
stop_atmel_card(dev); stop_atmel_card(dev);
((local_info_t*)link->priv)->eth_dev = NULL; ((local_info_t*)link->priv)->eth_dev = NULL;
/* Don't bother checking to see if these succeed or not */ pcmcia_disable_device(link->handle);
pcmcia_release_configuration(link->handle);
if (link->io.NumPorts1)
pcmcia_release_io(link->handle, &link->io);
if (link->irq.AssignedIRQ)
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
} }
static int atmel_suspend(struct pcmcia_device *dev) static int atmel_suspend(struct pcmcia_device *dev)

11
drivers/net/wireless/hostap/hostap_cs.c
View file

@ -804,16 +804,7 @@ static void prism2_release(u_long arg)
iface->local->shutdown = 1; iface->local->shutdown = 1;
} }
if (link->win) pcmcia_disable_device(link->handle);
pcmcia_release_window(link->win);
pcmcia_release_configuration(link->handle);
if (link->io.NumPorts1)
pcmcia_release_io(link->handle, &link->io);
if (link->irq.AssignedIRQ)
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
PDEBUG(DEBUG_FLOW, "release - done\n"); PDEBUG(DEBUG_FLOW, "release - done\n");
} }

19
drivers/net/wireless/netwave_cs.c
View file

@ -869,21 +869,14 @@ static void netwave_pcmcia_config(dev_link_t *link) {
*/ */
static void netwave_release(dev_link_t *link) static void netwave_release(dev_link_t *link)
{ {
struct net_device *dev = link->priv; struct net_device *dev = link->priv;
netwave_private *priv = netdev_priv(dev); netwave_private *priv = netdev_priv(dev);
DEBUG(0, "netwave_release(0x%p)\n", link); DEBUG(0, "netwave_release(0x%p)\n", link);
/* Don't bother checking to see if these succeed or not */ pcmcia_disable_device(link->handle);
if (link->win) { if (link->win)
iounmap(priv->ramBase); iounmap(priv->ramBase);
pcmcia_release_window(link->win);
}
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
} }
static int netwave_suspend(struct pcmcia_device *p_dev) static int netwave_suspend(struct pcmcia_device *p_dev)

8
drivers/net/wireless/orinoco_cs.c
View file

@ -416,13 +416,7 @@ orinoco_cs_release(dev_link_t *link)
priv->hw_unavailable++; priv->hw_unavailable++;
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
/* Don't bother checking to see if these succeed or not */ pcmcia_disable_device(link->handle);
pcmcia_release_configuration(link->handle);
if (link->io.NumPorts1)
pcmcia_release_io(link->handle, &link->io);
if (link->irq.AssignedIRQ)
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
if (priv->hw.iobase) if (priv->hw.iobase)
ioport_unmap(priv->hw.iobase); ioport_unmap(priv->hw.iobase);
} /* orinoco_cs_release */ } /* orinoco_cs_release */

8
drivers/net/wireless/spectrum_cs.c
View file

@ -894,13 +894,7 @@ spectrum_cs_release(dev_link_t *link)
priv->hw_unavailable++; priv->hw_unavailable++;
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
/* Don't bother checking to see if these succeed or not */ pcmcia_disable_device(link->handle);
pcmcia_release_configuration(link->handle);
if (link->io.NumPorts1)
pcmcia_release_io(link->handle, &link->io);
if (link->irq.AssignedIRQ)
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
if (priv->hw.iobase) if (priv->hw.iobase)
ioport_unmap(priv->hw.iobase); ioport_unmap(priv->hw.iobase);
} /* spectrum_cs_release */ } /* spectrum_cs_release */

18
drivers/net/wireless/wavelan_cs.c
View file

@ -4098,24 +4098,18 @@ wv_pcmcia_config(dev_link_t * link)
static void static void
wv_pcmcia_release(dev_link_t *link) wv_pcmcia_release(dev_link_t *link)
{ {
struct net_device * dev = (struct net_device *) link->priv; struct net_device * dev = (struct net_device *) link->priv;
net_local * lp = netdev_priv(dev); net_local * lp = netdev_priv(dev);
#ifdef DEBUG_CONFIG_TRACE #ifdef DEBUG_CONFIG_TRACE
printk(KERN_DEBUG "%s: -> wv_pcmcia_release(0x%p)\n", dev->name, link); printk(KERN_DEBUG "%s: -> wv_pcmcia_release(0x%p)\n", dev->name, link);
#endif #endif
/* Don't bother checking to see if these succeed or not */ iounmap(lp->mem);
iounmap(lp->mem); pcmcia_disable_device(link->handle);
pcmcia_release_window(link->win);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
#ifdef DEBUG_CONFIG_TRACE #ifdef DEBUG_CONFIG_TRACE
printk(KERN_DEBUG "%s: <- wv_pcmcia_release()\n", dev->name); printk(KERN_DEBUG "%s: <- wv_pcmcia_release()\n", dev->name);
#endif #endif
} }

10
drivers/net/wireless/wl3501_cs.c
View file

@ -2149,16 +2149,10 @@ static void wl3501_release(dev_link_t *link)
struct net_device *dev = link->priv; struct net_device *dev = link->priv;
/* Unlink the device chain */ /* Unlink the device chain */
if (link->dev) { if (link->dev)
unregister_netdev(dev); unregister_netdev(dev);
link->dev = NULL;
}
/* Don't bother checking to see if these succeed or not */ pcmcia_disable_device(link->handle);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
} }
static int wl3501_suspend(struct pcmcia_device *p_dev) static int wl3501_suspend(struct pcmcia_device *p_dev)

24
drivers/parport/parport_cs.c
View file

@ -267,23 +267,17 @@ void parport_config(dev_link_t *link)
void parport_cs_release(dev_link_t *link) void parport_cs_release(dev_link_t *link)
{ {
parport_info_t *info = link->priv; parport_info_t *info = link->priv;
DEBUG(0, "parport_release(0x%p)\n", link);
if (info->ndev) { DEBUG(0, "parport_release(0x%p)\n", link);
struct parport *p = info->port;
parport_pc_unregister_port(p);
}
info->ndev = 0;
link->dev = NULL;
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
if (info->ndev) {
struct parport *p = info->port;
parport_pc_unregister_port(p);
}
info->ndev = 0;
pcmcia_disable_device(link->handle);
} /* parport_cs_release */ } /* parport_cs_release */
static int parport_suspend(struct pcmcia_device *dev) static int parport_suspend(struct pcmcia_device *dev)

71
drivers/pcmcia/pcmcia_resource.c
View file

@ -451,20 +451,20 @@ int pcmcia_release_configuration(struct pcmcia_device *p_dev)
{ {
pccard_io_map io = { 0, 0, 0, 0, 1 }; pccard_io_map io = { 0, 0, 0, 0, 1 };
struct pcmcia_socket *s = p_dev->socket; struct pcmcia_socket *s = p_dev->socket;
config_t *c = p_dev->function_config;
int i; int i;
if (!(p_dev->state & CLIENT_CONFIG_LOCKED)) if (p_dev->state & CLIENT_CONFIG_LOCKED) {
return CS_BAD_HANDLE; p_dev->state &= ~CLIENT_CONFIG_LOCKED;
p_dev->state &= ~CLIENT_CONFIG_LOCKED;
if (!(p_dev->state & CLIENT_STALE)) {
config_t *c = p_dev->function_config;
if (--(s->lock_count) == 0) { if (--(s->lock_count) == 0) {
s->socket.flags = SS_OUTPUT_ENA; /* Is this correct? */ s->socket.flags = SS_OUTPUT_ENA; /* Is this correct? */
s->socket.Vpp = 0; s->socket.Vpp = 0;
s->socket.io_irq = 0; s->socket.io_irq = 0;
s->ops->set_socket(s, &s->socket); s->ops->set_socket(s, &s->socket);
} }
}
if (c->state & CONFIG_LOCKED) {
c->state &= ~CONFIG_LOCKED;
if (c->state & CONFIG_IO_REQ) if (c->state & CONFIG_IO_REQ)
for (i = 0; i < MAX_IO_WIN; i++) { for (i = 0; i < MAX_IO_WIN; i++) {
if (!s->io[i].res) if (!s->io[i].res)
@ -475,7 +475,6 @@ int pcmcia_release_configuration(struct pcmcia_device *p_dev)
io.map = i; io.map = i;
s->ops->set_io_map(s, &io); s->ops->set_io_map(s, &io);
} }
c->state &= ~CONFIG_LOCKED;
} }
return CS_SUCCESS; return CS_SUCCESS;
@ -494,22 +493,20 @@ EXPORT_SYMBOL(pcmcia_release_configuration);
int pcmcia_release_io(struct pcmcia_device *p_dev, io_req_t *req) int pcmcia_release_io(struct pcmcia_device *p_dev, io_req_t *req)
{ {
struct pcmcia_socket *s = p_dev->socket; struct pcmcia_socket *s = p_dev->socket;
config_t *c = p_dev->function_config;
if (!(p_dev->state & CLIENT_IO_REQ)) if (!(p_dev->state & CLIENT_IO_REQ))
return CS_BAD_HANDLE; return CS_BAD_HANDLE;
p_dev->state &= ~CLIENT_IO_REQ; p_dev->state &= ~CLIENT_IO_REQ;
if (!(p_dev->state & CLIENT_STALE)) { if ((c->io.BasePort1 != req->BasePort1) ||
config_t *c = p_dev->function_config; (c->io.NumPorts1 != req->NumPorts1) ||
if (c->state & CONFIG_LOCKED) (c->io.BasePort2 != req->BasePort2) ||
return CS_CONFIGURATION_LOCKED; (c->io.NumPorts2 != req->NumPorts2))
if ((c->io.BasePort1 != req->BasePort1) || return CS_BAD_ARGS;
(c->io.NumPorts1 != req->NumPorts1) ||
(c->io.BasePort2 != req->BasePort2) || c->state &= ~CONFIG_IO_REQ;
(c->io.NumPorts2 != req->NumPorts2))
return CS_BAD_ARGS;
c->state &= ~CONFIG_IO_REQ;
}
release_io_space(s, req->BasePort1, req->NumPorts1); release_io_space(s, req->BasePort1, req->NumPorts1);
if (req->NumPorts2) if (req->NumPorts2)
@ -523,22 +520,21 @@ EXPORT_SYMBOL(pcmcia_release_io);
int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req) int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req)
{ {
struct pcmcia_socket *s = p_dev->socket; struct pcmcia_socket *s = p_dev->socket;
config_t *c= p_dev->function_config;
if (!(p_dev->state & CLIENT_IRQ_REQ)) if (!(p_dev->state & CLIENT_IRQ_REQ))
return CS_BAD_HANDLE; return CS_BAD_HANDLE;
p_dev->state &= ~CLIENT_IRQ_REQ; p_dev->state &= ~CLIENT_IRQ_REQ;
if (!(p_dev->state & CLIENT_STALE)) { if (c->state & CONFIG_LOCKED)
config_t *c= p_dev->function_config; return CS_CONFIGURATION_LOCKED;
if (c->state & CONFIG_LOCKED) if (c->irq.Attributes != req->Attributes)
return CS_CONFIGURATION_LOCKED; return CS_BAD_ATTRIBUTE;
if (c->irq.Attributes != req->Attributes) if (s->irq.AssignedIRQ != req->AssignedIRQ)
return CS_BAD_ATTRIBUTE; return CS_BAD_IRQ;
if (s->irq.AssignedIRQ != req->AssignedIRQ) if (--s->irq.Config == 0) {
return CS_BAD_IRQ; c->state &= ~CONFIG_IRQ_REQ;
if (--s->irq.Config == 0) { s->irq.AssignedIRQ = 0;
c->state &= ~CONFIG_IRQ_REQ;
s->irq.AssignedIRQ = 0;
}
} }
if (req->Attributes & IRQ_HANDLE_PRESENT) { if (req->Attributes & IRQ_HANDLE_PRESENT) {
@ -929,3 +925,18 @@ int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_h
return CS_SUCCESS; return CS_SUCCESS;
} /* pcmcia_request_window */ } /* pcmcia_request_window */
EXPORT_SYMBOL(pcmcia_request_window); EXPORT_SYMBOL(pcmcia_request_window);
void pcmcia_disable_device(struct pcmcia_device *p_dev) {
if (!p_dev->instance)
return;
pcmcia_release_configuration(p_dev);
pcmcia_release_io(p_dev, &p_dev->instance->io);
pcmcia_release_irq(p_dev, &p_dev->instance->irq);
if (&p_dev->instance->win)
pcmcia_release_window(p_dev->instance->win);
p_dev->instance->dev = NULL;
p_dev->instance->state &= ~DEV_CONFIG;
}
EXPORT_SYMBOL(pcmcia_disable_device);

8
drivers/scsi/pcmcia/aha152x_stub.c
View file

@ -248,13 +248,7 @@ static void aha152x_release_cs(dev_link_t *link)
scsi_info_t *info = link->priv; scsi_info_t *info = link->priv;
aha152x_release(info->host); aha152x_release(info->host);
link->dev = NULL; pcmcia_disable_device(link->handle);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
} }
static int aha152x_suspend(struct pcmcia_device *dev) static int aha152x_suspend(struct pcmcia_device *dev)

17
drivers/scsi/pcmcia/fdomain_stub.c
View file

@ -209,20 +209,13 @@ static void fdomain_config(dev_link_t *link)
static void fdomain_release(dev_link_t *link) static void fdomain_release(dev_link_t *link)
{ {
scsi_info_t *info = link->priv; scsi_info_t *info = link->priv;
DEBUG(0, "fdomain_release(0x%p)\n", link); DEBUG(0, "fdomain_release(0x%p)\n", link);
scsi_remove_host(info->host); scsi_remove_host(info->host);
link->dev = NULL; pcmcia_disable_device(link->handle);
scsi_unregister(info->host);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
scsi_unregister(info->host);
link->state &= ~DEV_CONFIG;
} }
/*====================================================================*/ /*====================================================================*/

11
drivers/scsi/pcmcia/nsp_cs.c
View file

@ -1974,16 +1974,9 @@ static void nsp_cs_release(dev_link_t *link)
if (data != NULL) { if (data != NULL) {
iounmap((void *)(data->MmioAddress)); iounmap((void *)(data->MmioAddress));
} }
pcmcia_release_window(link->win);
} }
pcmcia_release_configuration(link->handle); pcmcia_disable_device(link->handle);
if (link->io.NumPorts1) {
pcmcia_release_io(link->handle, &link->io);
}
if (link->irq.AssignedIRQ) {
pcmcia_release_irq(link->handle, &link->irq);
}
link->state &= ~DEV_CONFIG;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,2)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,2))
if (info->host != NULL) { if (info->host != NULL) {
scsi_host_put(info->host); scsi_host_put(info->host);

9
drivers/scsi/pcmcia/qlogic_stub.c
View file

@ -289,6 +289,7 @@ static void qlogic_config(dev_link_t * link)
cs_failed: cs_failed:
cs_error(link->handle, last_fn, last_ret); cs_error(link->handle, last_fn, last_ret);
link->dev = NULL; link->dev = NULL;
pcmcia_release_configuration(link->handle); pcmcia_release_configuration(link->handle);
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);
@ -306,17 +307,11 @@ static void qlogic_release(dev_link_t *link)
DEBUG(0, "qlogic_release(0x%p)\n", link); DEBUG(0, "qlogic_release(0x%p)\n", link);
scsi_remove_host(info->host); scsi_remove_host(info->host);
link->dev = NULL;
free_irq(link->irq.AssignedIRQ, info->host); free_irq(link->irq.AssignedIRQ, info->host);
pcmcia_disable_device(link->handle);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
scsi_host_put(info->host); scsi_host_put(info->host);
link->state &= ~DEV_CONFIG;
} }
/*====================================================================*/ /*====================================================================*/

8
drivers/scsi/pcmcia/sym53c500_cs.c
View file

@ -550,13 +550,7 @@ SYM53C500_release(dev_link_t *link)
if (shost->io_port && shost->n_io_port) if (shost->io_port && shost->n_io_port)
release_region(shost->io_port, shost->n_io_port); release_region(shost->io_port, shost->n_io_port);
link->dev = NULL; pcmcia_disable_device(link->handle);
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
scsi_host_put(shost); scsi_host_put(shost);
} /* SYM53C500_release */ } /* SYM53C500_release */

7
drivers/serial/serial_cs.c
View file

@ -141,11 +141,8 @@ static void serial_remove(dev_link_t *link)
info->link.dev = NULL; info->link.dev = NULL;
if (!info->slave) { if (!info->slave)
pcmcia_release_configuration(info->link.handle); pcmcia_disable_device(link->handle);
pcmcia_release_io(info->link.handle, &info->link.io);
pcmcia_release_irq(info->link.handle, &info->link.irq);
}
info->link.state &= ~DEV_CONFIG; info->link.state &= ~DEV_CONFIG;
} }

2
include/pcmcia/cs.h
View file

@ -392,6 +392,8 @@ int pcmcia_eject_card(struct pcmcia_socket *skt);
int pcmcia_insert_card(struct pcmcia_socket *skt); int pcmcia_insert_card(struct pcmcia_socket *skt);
int pccard_reset_card(struct pcmcia_socket *skt); int pccard_reset_card(struct pcmcia_socket *skt);
void pcmcia_disable_device(struct pcmcia_device *p_dev);
struct pcmcia_socket * pcmcia_get_socket(struct pcmcia_socket *skt); struct pcmcia_socket * pcmcia_get_socket(struct pcmcia_socket *skt);
void pcmcia_put_socket(struct pcmcia_socket *skt); void pcmcia_put_socket(struct pcmcia_socket *skt);

8
sound/pcmcia/pdaudiocf/pdaudiocf.c
View file

@ -62,13 +62,7 @@ static void snd_pdacf_detach(struct pcmcia_device *p_dev);
static void pdacf_release(dev_link_t *link) static void pdacf_release(dev_link_t *link)
{ {
if (link->state & DEV_CONFIG) { pcmcia_disable_device(link->handle);
/* release cs resources */
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
}
} }
/* /*

8
sound/pcmcia/vx/vxpocket.c
View file

@ -61,13 +61,7 @@ static unsigned int card_alloc;
*/ */
static void vxpocket_release(dev_link_t *link) static void vxpocket_release(dev_link_t *link)
{ {
if (link->state & DEV_CONFIG) { pcmcia_disable_device(link->handle);
/* release cs resources */
pcmcia_release_configuration(link->handle);
pcmcia_release_io(link->handle, &link->io);
pcmcia_release_irq(link->handle, &link->irq);
link->state &= ~DEV_CONFIG;
}
} }
/* /*