[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, 0 insertions, 22 deletions

diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index db3755b28f5..fd5d7364a48 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -194,28 +194,6 @@ static int avmcs_config(struct pcmcia_device *link)
 
     dev = link->priv;
 
-    /*
-       This reads the card's CONFIG tuple to find its configuration
-       registers.
-    */
-    do {
-        tuple.DesiredTuple = CISTPL_CONFIG;
-        i = pcmcia_get_first_tuple(link, &tuple);
-        if (i != CS_SUCCESS) break;
-        tuple.TupleData = buf;
-        tuple.TupleDataMax = 64;
-        tuple.TupleOffset = 0;
-        i = pcmcia_get_tuple_data(link, &tuple);
-        if (i != CS_SUCCESS) break;
-        i = pcmcia_parse_tuple(link, &tuple, &parse);
-        if (i != CS_SUCCESS) break;
-        link->conf.ConfigBase = parse.config.base;
-    } while (0);
-    if (i != CS_SUCCESS) {
-        cs_error(link, ParseTuple, i);
-        return -ENODEV;
-    }
-
     do {
         devname[0] = 0;
         if (link->prod_id[1])