diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-06-04 20:06:13 +0400 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-12-05 04:09:21 +0300 |
| commit | a9606fd39083478bef313c0e3b77bc065e39e36e (patch) | |
| tree | d9ee62f811e557671fad5cecf669f93300b6c57a /drivers/net/pcmcia/3c574_cs.c | |
| parent | efd50585e2ff9bd60e044fda7764d323010a7fe4 (diff) | |
| download | linux-a9606fd39083478bef313c0e3b77bc065e39e36e.tar.xz | |
[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>
Diffstat (limited to 'drivers/net/pcmcia/3c574_cs.c')
| -rw-r--r-- | drivers/net/pcmcia/3c574_cs.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c index 046009928526..420f70b6b88a 100644 --- a/drivers/net/pcmcia/3c574_cs.c +++ b/drivers/net/pcmcia/3c574_cs.c @@ -397,12 +397,9 @@ static int tc574_config(struct pcmcia_device *link) goto failed; } } - tuple.DesiredTuple = CISTPL_VERS_1; - if (pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS && - pcmcia_get_tuple_data(link, &tuple) == CS_SUCCESS && - pcmcia_parse_tuple(link, &tuple, &parse) == CS_SUCCESS) { - cardname = parse.version_1.str + parse.version_1.ofs[1]; - } else + if (link->prod_id[1]) + cardname = link->prod_id[1]; + else cardname = "3Com 3c574"; { |