diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-01-15 10:05:19 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-03-31 17:15:51 +0200 |
| commit | 50db3fdbbc98260fb538c1cc3f8cc597ba7bffe7 (patch) | |
| tree | a3cd6076787d9c55467fcc598c997726315f80d1 /drivers/scsi | |
| parent | 5f2a71fcb7995633b335a1e380ac63a968e61320 (diff) | |
| download | blackbird-op-linux-50db3fdbbc98260fb538c1cc3f8cc597ba7bffe7.tar.gz blackbird-op-linux-50db3fdbbc98260fb538c1cc3f8cc597ba7bffe7.zip | |
[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 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/pcmcia/nsp_cs.c | 5 | ||||
| -rw-r--r-- | drivers/scsi/pcmcia/qlogic_stub.c | 7 |
2 files changed, 2 insertions, 10 deletions
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c index dd383c538d98..d469e0d16224 100644 --- a/drivers/scsi/pcmcia/nsp_cs.c +++ b/drivers/scsi/pcmcia/nsp_cs.c @@ -1802,10 +1802,7 @@ static void nsp_cs_config(dev_link_t *link) next_entry: nsp_dbg(NSP_DEBUG_INIT, "next"); - - if (link->io.NumPorts1) { - pcmcia_release_io(link->handle, &link->io); - } + pcmcia_disable_device(handle); CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(handle, &tuple)); } diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c index 70269fc10f30..1e27059cd462 100644 --- a/drivers/scsi/pcmcia/qlogic_stub.c +++ b/drivers/scsi/pcmcia/qlogic_stub.c @@ -288,12 +288,7 @@ out: cs_failed: cs_error(link->handle, last_fn, last_ret); - 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); return; } /* qlogic_config */ |
