android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Dominik Brodowski 2005-09-09 13:03:27 -07:00 committed by Linus Torvalds
parent 76d82ec526
commit 71ed90d89e
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/pcmcia/cs_internal.h
View File

@ -42,7 +42,6 @@ typedef struct region_t {
typedef struct config_t { typedef struct config_t {
u_int state; u_int state;
u_int Attributes; u_int Attributes;
u_int Vcc, Vpp1, Vpp2;
u_int IntType; u_int IntType;
u_int ConfigBase; u_int ConfigBase;
u_char Status, Pin, Copy, Option, ExtStatus; u_char Status, Pin, Copy, Option, ExtStatus;

4
drivers/pcmcia/pcmcia_resource.c
View File

@ -447,7 +447,7 @@ int pcmcia_modify_configuration(struct pcmcia_device *p_dev,
(mod->Attributes & CONF_VPP2_CHANGE_VALID)) { (mod->Attributes & CONF_VPP2_CHANGE_VALID)) {
if (mod->Vpp1 != mod->Vpp2) if (mod->Vpp1 != mod->Vpp2)
return CS_BAD_VPP; 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)) if (s->ops->set_socket(s, &s->socket))
return CS_BAD_VPP; return CS_BAD_VPP;
} else if ((mod->Attributes & CONF_VPP1_CHANGE_VALID) || } 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)) if (s->ops->set_socket(s, &s->socket))
return CS_BAD_VPP; return CS_BAD_VPP;
c->Vcc = req->Vcc; c->Vpp1 = c->Vpp2 = req->Vpp1;
/* Pick memory or I/O card, DMA mode, interrupt */ /* Pick memory or I/O card, DMA mode, interrupt */
c->IntType = req->IntType; c->IntType = req->IntType;
c->Attributes = req->Attributes; c->Attributes = req->Attributes;