diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-10-26 03:28:53 +0200 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-12-05 02:09:20 +0100 |
| commit | efd50585e2ff9bd60e044fda7764d323010a7fe4 (patch) | |
| tree | f43f8f10a3cfe6ceb1b5cede6581f79134ca0e63 /drivers/ata/pata_pcmcia.c | |
| parent | [PATCH] pcmcia: IDs for Elan serial PCMCIA devcies (diff) | |
| download | linux-efd50585e2ff9bd60e044fda7764d323010a7fe4.tar.xz linux-efd50585e2ff9bd60e044fda7764d323010a7fe4.zip | |
[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/ata/pata_pcmcia.c')
| -rw-r--r-- | drivers/ata/pata_pcmcia.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c index 3ce33bfdcccc..da7c218c9cce 100644 --- a/drivers/ata/pata_pcmcia.c +++ b/drivers/ata/pata_pcmcia.c @@ -164,9 +164,9 @@ static int pcmcia_init_one(struct pcmcia_device *pdev) /* See if we have a manufacturer identifier. Use it to set is_kme for vendor quirks */ - tuple.DesiredTuple = CISTPL_MANFID; - if (!pcmcia_get_first_tuple(pdev, &tuple) && !pcmcia_get_tuple_data(pdev, &tuple) && !pcmcia_parse_tuple(pdev, &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 = ((pdev->manf_id == MANFID_KME) && + ((pdev->card_id == PRODID_KME_KXLC005_A) || + (pdev->card_id == PRODID_KME_KXLC005_B))); /* Not sure if this is right... look up the current Vcc */ CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(pdev, &stk->conf)); |