diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-01-15 04:05:19 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-03-31 10:15:51 -0500 |
commit | 50db3fdbbc98260fb538c1cc3f8cc597ba7bffe7 (patch) | |
tree | a3cd6076787d9c55467fcc598c997726315f80d1 /sound | |
parent | 5f2a71fcb7995633b335a1e380ac63a968e61320 (diff) |
[PATCH] pcmcia: convert remaining users of pcmcia_release_io and _irq
Convert the remaining drivers which use pcmcia_release_io or
pcmcia_release_irq, and remove the EXPORT of these symbols.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.c | 4 | ||||
-rw-r--r-- | sound/pcmcia/vx/vxpocket.c | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c index a2d3eb47f83c..80c53553b815 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c | |||
@@ -273,9 +273,7 @@ static void pdacf_config(dev_link_t *link) | |||
273 | cs_failed: | 273 | cs_failed: |
274 | cs_error(link->handle, last_fn, last_ret); | 274 | cs_error(link->handle, last_fn, last_ret); |
275 | failed: | 275 | failed: |
276 | pcmcia_release_configuration(link->handle); | 276 | pcmcia_disable_device(link->handle); |
277 | pcmcia_release_io(link->handle, &link->io); | ||
278 | pcmcia_release_irq(link->handle, &link->irq); | ||
279 | } | 277 | } |
280 | 278 | ||
281 | #ifdef CONFIG_PM | 279 | #ifdef CONFIG_PM |
diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c index 92788744bc48..8093e5044956 100644 --- a/sound/pcmcia/vx/vxpocket.c +++ b/sound/pcmcia/vx/vxpocket.c | |||
@@ -272,10 +272,7 @@ static void vxpocket_config(dev_link_t *link) | |||
272 | cs_failed: | 272 | cs_failed: |
273 | cs_error(link->handle, last_fn, last_ret); | 273 | cs_error(link->handle, last_fn, last_ret); |
274 | failed: | 274 | failed: |
275 | pcmcia_release_configuration(link->handle); | 275 | pcmcia_disable_device(link->handle); |
276 | pcmcia_release_io(link->handle, &link->io); | ||
277 | pcmcia_release_irq(link->handle, &link->irq); | ||
278 | link->state &= ~DEV_CONFIG; | ||
279 | kfree(parse); | 276 | kfree(parse); |
280 | } | 277 | } |
281 | 278 | ||