[PATCH] pcmcia: remove unneeded Vcc pseudo setting

As we do not allow setting Vcc in the pcmcia core, and Vpp1 and
Vpp2 can only be set to the same value, a lot of code can be
streamlined.

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

1 files changed, 1 insertions, 5 deletions

diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index 16504f852af2..17e2fbf26e14 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -618,11 +618,7 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev,
                 return CS_CONFIGURATION_LOCKED;
 
         /* Do power control.  We don't allow changes in Vcc. */
-        if (s->socket.Vcc != req->Vcc)
-                return CS_BAD_VCC;
-        if (req->Vpp1 != req->Vpp2)
-                return CS_BAD_VPP;
-        s->socket.Vpp = req->Vpp1;
+        s->socket.Vpp = req->Vpp;
         if (s->ops->set_socket(s, &s->socket))
                 return CS_BAD_VPP;