diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-10-26 05:28:53 +0400 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-12-05 04:09:20 +0300 |
| commit | efd50585e2ff9bd60e044fda7764d323010a7fe4 (patch) | |
| tree | f43f8f10a3cfe6ceb1b5cede6581f79134ca0e63 /drivers/ide/legacy/ide-cs.c | |
| parent | 44e5e33e99e1b955ac6f0bb26abd9380629b48a9 (diff) | |
| download | linux-efd50585e2ff9bd60e044fda7764d323010a7fe4.tar.xz | |
[PATCH] pcmcia: remove manf_id and card_id indirection
As we read out the manufactor and card_id from the PCMCIA device in the
PCMCIA core, and device drivers can access those reliably in struct
pcmcia_device's fields manf_id and card_id, remove additional (and partly
broken) manf_id and card_id detection logic from PCMCIA device drivers.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/ide/legacy/ide-cs.c')
| -rw-r--r-- | drivers/ide/legacy/ide-cs.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c index 7e8d778dcb88..1b996e62a404 100644 --- a/drivers/ide/legacy/ide-cs.c +++ b/drivers/ide/legacy/ide-cs.c @@ -199,13 +199,9 @@ static int ide_config(struct pcmcia_device *link) link->conf.ConfigBase = stk->parse.config.base; link->conf.Present = stk->parse.config.rmask[0]; - tuple.DesiredTuple = CISTPL_MANFID; - if (!pcmcia_get_first_tuple(link, &tuple) && - !pcmcia_get_tuple_data(link, &tuple) && - !pcmcia_parse_tuple(link, &tuple, &stk->parse)) - is_kme = ((stk->parse.manfid.manf == MANFID_KME) && - ((stk->parse.manfid.card == PRODID_KME_KXLC005_A) || - (stk->parse.manfid.card == PRODID_KME_KXLC005_B))); + is_kme = ((link->manf_id == MANFID_KME) && + ((link->card_id == PRODID_KME_KXLC005_A) || + (link->card_id == PRODID_KME_KXLC005_B))); /* Not sure if this is right... look up the current Vcc */ CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &stk->conf)); |