[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>

1 files changed, 8 insertions, 18 deletions

diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 65f6fdf43725..e3731fd15606 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -374,17 +374,12 @@ static int fmvj18x_config(struct pcmcia_device *link)
         CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
         CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
         link->conf.ConfigIndex = parse.cftable_entry.index;
-        tuple.DesiredTuple = CISTPL_MANFID;
-        if (pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS)
-            CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
-        else
-            buf[0] = 0xffff;
-        switch (le16_to_cpu(buf[0])) {
+        switch (link->manf_id) {
         case MANFID_TDK:
             cardtype = TDK;
-            if (le16_to_cpu(buf[1]) == PRODID_TDK_GN3410
-                        || le16_to_cpu(buf[1]) == PRODID_TDK_NP9610
-                        || le16_to_cpu(buf[1]) == PRODID_TDK_MN3200) {
+            if (link->card_id == PRODID_TDK_GN3410
+                        || link->card_id == PRODID_TDK_NP9610
+                        || link->card_id == PRODID_TDK_MN3200) {
                 /* MultiFunction Card */
                 link->conf.ConfigBase = 0x800;
                 link->conf.ConfigIndex = 0x47;
@@ -395,11 +390,11 @@ static int fmvj18x_config(struct pcmcia_device *link)
             cardtype = CONTEC;
             break;
         case MANFID_FUJITSU:
-            if (le16_to_cpu(buf[1]) == PRODID_FUJITSU_MBH10302)
+            if (link->card_id == PRODID_FUJITSU_MBH10302)
                 /* RATOC REX-5588/9822/4886's PRODID are 0004(=MBH10302),
                    but these are MBH10304 based card. */ 
                 cardtype = MBH10304;
-            else if (le16_to_cpu(buf[1]) == PRODID_FUJITSU_MBH10304)
+            else if (link->card_id == PRODID_FUJITSU_MBH10304)
                 cardtype = MBH10304;
             else
                 cardtype = LA501;
@@ -409,14 +404,9 @@ static int fmvj18x_config(struct pcmcia_device *link)
         }
     } else {
         /* old type card */
-        tuple.DesiredTuple = CISTPL_MANFID;
-        if (pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS)
-            CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
-        else
-            buf[0] = 0xffff;
-        switch (le16_to_cpu(buf[0])) {
+        switch (link->manf_id) {
         case MANFID_FUJITSU:
-            if (le16_to_cpu(buf[1]) == PRODID_FUJITSU_MBH10304) {
+            if (link->card_id == PRODID_FUJITSU_MBH10304) {
                 cardtype = XXX10304;    /* MBH10304 with buggy CIS */
                 link->conf.ConfigIndex = 0x20;
             } else {