The patch titled
pcmcia: remove unused Vpp1, Vpp2 and Vcc
has been added to the -mm tree. Its filename is
pcmcia-remove-unused-vpp1-vpp2-and-vcc.patch
Patches currently in -mm which might be from [EMAIL PROTECTED] are
pcmcia-reduce-dsc-stack-footprint.patch
yenta-share-code-with-pci-core.patch
fix-pcmcia_request_irq-for-multifunction-card.patch
pcmcia-yenta-avoid-pci-write-posting-problem.patch
yenta-auto-tune-ene-bridges-for-cb-cards.patch
pcmcia-yenta-dont-mess-with-bridge-control-register.patch
pcmcia-remove-unused-client_t.patch
pcmcia-remove-unused-vpp1-vpp2-and-vcc.patch
pcmcia-omap-cf-controller.patch
pcmcia-more-ids-for-ide_cs.patch
pcmcia-add-pcmcia-to-irq-information.patch
From: Dominik Brodowski <[EMAIL PROTECTED]>
config_t->Vpp1, Vpp2 and Vcc are never read, so remove them.
Signed-off-by: Dominik Brodowski <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
drivers/pcmcia/cs_internal.h | 1 -
drivers/pcmcia/pcmcia_resource.c | 4 +---
2 files changed, 1 insertion(+), 4 deletions(-)
diff -puN drivers/pcmcia/cs_internal.h~pcmcia-remove-unused-vpp1-vpp2-and-vcc
drivers/pcmcia/cs_internal.h
--- devel/drivers/pcmcia/cs_internal.h~pcmcia-remove-unused-vpp1-vpp2-and-vcc
2005-08-29 22:30:38.000000000 -0700
+++ devel-akpm/drivers/pcmcia/cs_internal.h 2005-08-29 22:30:38.000000000
-0700
@@ -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 -puN
drivers/pcmcia/pcmcia_resource.c~pcmcia-remove-unused-vpp1-vpp2-and-vcc
drivers/pcmcia/pcmcia_resource.c
---
devel/drivers/pcmcia/pcmcia_resource.c~pcmcia-remove-unused-vpp1-vpp2-and-vcc
2005-08-29 22:30:38.000000000 -0700
+++ devel-akpm/drivers/pcmcia/pcmcia_resource.c 2005-08-29 22:30:38.000000000
-0700
@@ -447,7 +447,7 @@ int pcmcia_modify_configuration(struct p
(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
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;
_
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
