[PATCH] pcmcia: remove unused Vpp1, Vpp2 and Vcc

config_t->Vpp1, Vpp2 and Vcc are never read, so remove them.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h
index 4d5ffdcfeca37a21a4d06b38908437c8b7f136ca..55867bc7f199664eb4c9eb97dea3fcd13ae3dec6 100644 (file)
--- a/drivers/pcmcia/cs_internal.h
+++ b/drivers/pcmcia/cs_internal.h
@@ -42,7 +42,6 @@ typedef struct region_t {
 typedef struct config_t {
     u_int              state;
     u_int              Attributes;
-    u_int              Vcc, Vpp1, Vpp2;
     u_int              IntType;
     u_int              ConfigBase;
     u_char             Status, Pin, Copy, Option, ExtStatus;

diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index c0f4eb49177bfffb2a6b8434c9987243c1c40f32..deb6d00bc2ff5c365ebf0f79796cfab949428f97 100644 (file)
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -447,7 +447,7 @@ int pcmcia_modify_configuration(struct pcmcia_device *p_dev,
            (mod->Attributes & CONF_VPP2_CHANGE_VALID)) {
                if (mod->Vpp1 != mod->Vpp2)
                        return CS_BAD_VPP;
-               c->Vpp1 = c->Vpp2 = s->socket.Vpp = mod->Vpp1;
+               s->socket.Vpp = mod->Vpp1;
                if (s->ops->set_socket(s, &s->socket))
                        return CS_BAD_VPP;
        } else if ((mod->Attributes & CONF_VPP1_CHANGE_VALID) ||
@@ -623,8 +623,6 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev,
        if (s->ops->set_socket(s, &s->socket))
                return CS_BAD_VPP;
 
-       c->Vcc = req->Vcc; c->Vpp1 = c->Vpp2 = req->Vpp1;
-
        /* Pick memory or I/O card, DMA mode, interrupt */
        c->IntType = req->IntType;
        c->Attributes = req->Attributes;