[PATCH] pcmcia: remove prod_id indirection

As we read out the product information strings (VERS_1) from the PCMCIA device
in the PCMCIA core, and device drivers can access those reliably in struct
pcmcia_device's fields prod_id[], remove additional product information string
detection logic from PCMCIA device drivers.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

1 files changed, 3 insertions, 11 deletions

diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index 7bbfd85ab793..db3755b28f53 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -217,18 +217,10 @@ static int avmcs_config(struct pcmcia_device *link)
     }
 
     do {
-
-        tuple.Attributes = 0;
-        tuple.TupleData = buf;
-        tuple.TupleDataMax = 254;
-        tuple.TupleOffset = 0;
-        tuple.DesiredTuple = CISTPL_VERS_1;
-
         devname[0] = 0;
-        if( !first_tuple(link, &tuple, &parse) && parse.version_1.ns > 1 ) {
-            strlcpy(devname,parse.version_1.str + parse.version_1.ofs[1], 
-                        sizeof(devname));
-        }
+        if (link->prod_id[1])
+                strlcpy(devname, link->prod_id[1], sizeof(devname));
+
         /*
          * find IO port
          */