Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Dominik Brodowski and committed by
Linus Torvalds
71ed90d8 76d82ec5

+1 -4
-1
drivers/pcmcia/cs_internal.h
··· 42 42 typedef struct config_t { 43 43 u_int state; 44 44 u_int Attributes; 45 - u_int Vcc, Vpp1, Vpp2; 46 45 u_int IntType; 47 46 u_int ConfigBase; 48 47 u_char Status, Pin, Copy, Option, ExtStatus;
+1 -3
drivers/pcmcia/pcmcia_resource.c
··· 447 447 (mod->Attributes & CONF_VPP2_CHANGE_VALID)) { 448 448 if (mod->Vpp1 != mod->Vpp2) 449 449 return CS_BAD_VPP; 450 - c->Vpp1 = c->Vpp2 = s->socket.Vpp = mod->Vpp1; 450 + s->socket.Vpp = mod->Vpp1; 451 451 if (s->ops->set_socket(s, &s->socket)) 452 452 return CS_BAD_VPP; 453 453 } else if ((mod->Attributes & CONF_VPP1_CHANGE_VALID) || ··· 622 622 s->socket.Vpp = req->Vpp1; 623 623 if (s->ops->set_socket(s, &s->socket)) 624 624 return CS_BAD_VPP; 625 - 626 - c->Vcc = req->Vcc; c->Vpp1 = c->Vpp2 = req->Vpp1; 627 625 628 626 /* Pick memory or I/O card, DMA mode, interrupt */ 629 627 c->IntType = req->IntType;