[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, 1 insertions, 4 deletions

diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c
index 72fe5d055de1..80c28b9fb70a 100644
--- a/drivers/scsi/pcmcia/sym53c500_cs.c
+++ b/drivers/scsi/pcmcia/sym53c500_cs.c
@@ -731,10 +731,7 @@ SYM53C500_config(struct pcmcia_device *link)
         CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
         link->conf.ConfigBase = parse.config.base;
 
-        tuple.DesiredTuple = CISTPL_MANFID;
-        if ((pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) &&
-            (pcmcia_get_tuple_data(link, &tuple) == CS_SUCCESS))
-                info->manf_id = le16_to_cpu(tuple.TupleData[0]);
+        info->manf_id = link->manf_id;
 
         tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
         CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));