[PATCH] pcmcia: remove manf_id and card_id indirection

[linux-2.6] / drivers / ide / legacy / ide-cs.c

diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index 7e8d778dcb885a2a87575b3bf6d681226a6b90e5..1b996e62a4040898b42e7e4cb315e795ed0f0715 100644 (file)
--- 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));