diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2005-09-09 16:03:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 16:57:48 -0400 |
commit | 71ed90d89eff51a1137cbef727f11b8f7d5b20f1 (patch) | |
tree | a99d137d738e03bde1e957f08785788b4aa9082e /drivers/pcmcia/pcmcia_resource.c | |
parent | 76d82ec526b0549cedf332d80929c8c225b653fa (diff) |
[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>
Diffstat (limited to 'drivers/pcmcia/pcmcia_resource.c')
-rw-r--r-- | drivers/pcmcia/pcmcia_resource.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c index c0f4eb49177b..deb6d00bc2ff 100644 --- 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, | |||
447 | (mod->Attributes & CONF_VPP2_CHANGE_VALID)) { | 447 | (mod->Attributes & CONF_VPP2_CHANGE_VALID)) { |
448 | if (mod->Vpp1 != mod->Vpp2) | 448 | if (mod->Vpp1 != mod->Vpp2) |
449 | return CS_BAD_VPP; | 449 | return CS_BAD_VPP; |
450 | c->Vpp1 = c->Vpp2 = s->socket.Vpp = mod->Vpp1; | 450 | s->socket.Vpp = mod->Vpp1; |
451 | if (s->ops->set_socket(s, &s->socket)) | 451 | if (s->ops->set_socket(s, &s->socket)) |
452 | return CS_BAD_VPP; | 452 | return CS_BAD_VPP; |
453 | } else if ((mod->Attributes & CONF_VPP1_CHANGE_VALID) || | 453 | } else if ((mod->Attributes & CONF_VPP1_CHANGE_VALID) || |
@@ -623,8 +623,6 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev, | |||
623 | if (s->ops->set_socket(s, &s->socket)) | 623 | if (s->ops->set_socket(s, &s->socket)) |
624 | return CS_BAD_VPP; | 624 | return CS_BAD_VPP; |
625 | 625 | ||
626 | c->Vcc = req->Vcc; c->Vpp1 = c->Vpp2 = req->Vpp1; | ||
627 | |||
628 | /* Pick memory or I/O card, DMA mode, interrupt */ | 626 | /* Pick memory or I/O card, DMA mode, interrupt */ |
629 | c->IntType = req->IntType; | 627 | c->IntType = req->IntType; |
630 | c->Attributes = req->Attributes; | 628 | c->Attributes = req->Attributes; |