aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/maps
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2006-01-15 06:43:16 -0500
committerDominik Brodowski <linux@dominikbrodowski.net>2006-03-31 10:15:55 -0500
commit70294b468302fd7a0a99dad935c7ba5322989345 (patch)
treee54b0b7c85517ef717f3755e06ca08fbb0f5937e /drivers/mtd/maps
parent4bbed5231468014b500b048d7370a1c6c349231a (diff)
[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>
Diffstat (limited to 'drivers/mtd/maps')
-rw-r--r--drivers/mtd/maps/pcmciamtd.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index f45ff2581dd3..0026460be153 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -587,13 +587,10 @@ static void pcmciamtd_config(dev_link_t *link)
587 DEBUG(2, "Vcc = %d Vpp1 = %d Vpp2 = %d", t.Vcc, t.Vpp1, t.Vpp2); 587 DEBUG(2, "Vcc = %d Vpp1 = %d Vpp2 = %d", t.Vcc, t.Vpp1, t.Vpp2);
588 dev->vpp = (vpp) ? vpp : t.Vpp1; 588 dev->vpp = (vpp) ? vpp : t.Vpp1;
589 link->conf.Attributes = 0; 589 link->conf.Attributes = 0;
590 link->conf.Vcc = t.Vcc;
591 if(setvpp == 2) { 590 if(setvpp == 2) {
592 link->conf.Vpp1 = dev->vpp; 591 link->conf.Vpp = dev->vpp;
593 link->conf.Vpp2 = dev->vpp;
594 } else { 592 } else {
595 link->conf.Vpp1 = 0; 593 link->conf.Vpp = 0;
596 link->conf.Vpp2 = 0;
597 } 594 }
598 595
599 link->conf.IntType = INT_MEMORY; 596 link->conf.IntType = INT_MEMORY;