[PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation

struct pcmcia_device *p_dev->conf.ConfigBase and .Present are set in almost
all PCMICA driver right at the beginning, using the same calls but slightly
different implementations. Unfiy this in the PCMCIA core.

Includes a small bugfix ("drivers/net/pcmcia/xirc2ps_cs.c: remove unused
label") from and Signed-off-by Adrian Bunk <bunk@stusta.de>

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

1 files changed, 4 insertions, 12 deletions

diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index 420f70b6b88a..794cc61819dd 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -338,7 +338,6 @@ static int tc574_config(struct pcmcia_device *link)
         struct net_device *dev = link->priv;
         struct el3_private *lp = netdev_priv(dev);
         tuple_t tuple;
-        cisparse_t parse;
         unsigned short buf[32];
         int last_fn, last_ret, i, j;
         kio_addr_t ioaddr;
@@ -350,17 +349,6 @@ static int tc574_config(struct pcmcia_device *link)
 
         DEBUG(0, "3c574_config(0x%p)\n", link);
 
-        tuple.Attributes = 0;
-        tuple.DesiredTuple = CISTPL_CONFIG;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
-        tuple.TupleData = (cisdata_t *)buf;
-        tuple.TupleDataMax = 64;
-        tuple.TupleOffset = 0;
-        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
-        CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
-        link->conf.ConfigBase = parse.config.base;
-        link->conf.Present = parse.config.rmask[0];
-
         link->io.IOAddrLines = 16;
         for (i = j = 0; j < 0x400; j += 0x20) {
                 link->io.BasePort1 = j ^ 0x300;
@@ -382,6 +370,10 @@ static int tc574_config(struct pcmcia_device *link)
         /* The 3c574 normally uses an EEPROM for configuration info, including
            the hardware address.  The future products may include a modem chip
            and put the address in the CIS. */
+        tuple.Attributes = 0;
+        tuple.TupleData = (cisdata_t *)buf;
+        tuple.TupleDataMax = 64;
+        tuple.TupleOffset = 0;
         tuple.DesiredTuple = 0x88;
         if (pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) {
                 pcmcia_get_tuple_data(link, &tuple);