aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/pcmcia/ipwireless/main.c10
-rw-r--r--drivers/mtd/maps/pcmciamtd.c12
-rw-r--r--drivers/serial/serial_cs.c18
3 files changed, 10 insertions, 30 deletions
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c
index 5eca7a99afe6..1f520e544d45 100644
--- a/drivers/char/pcmcia/ipwireless/main.c
+++ b/drivers/char/pcmcia/ipwireless/main.c
@@ -83,7 +83,6 @@ static int config_ipwireless(struct ipw_dev *ipw)
83{ 83{
84 struct pcmcia_device *link = ipw->link; 84 struct pcmcia_device *link = ipw->link;
85 int ret; 85 int ret;
86 config_info_t conf;
87 tuple_t tuple; 86 tuple_t tuple;
88 unsigned short buf[64]; 87 unsigned short buf[64];
89 cisparse_t parse; 88 cisparse_t parse;
@@ -297,15 +296,6 @@ static int config_ipwireless(struct ipw_dev *ipw)
297 goto exit3; 296 goto exit3;
298 } 297 }
299 298
300 /* Look up current Vcc */
301
302 ret = pcmcia_get_configuration_info(link, &conf);
303
304 if (ret != CS_SUCCESS) {
305 cs_error(link, GetConfigurationInfo, ret);
306 goto exit4;
307 }
308
309 printk(KERN_INFO IPWIRELESS_PCCARD_NAME ": Card type %s\n", 299 printk(KERN_INFO IPWIRELESS_PCCARD_NAME ": Card type %s\n",
310 ipw->is_v2_card ? "V2/V3" : "V1"); 300 ipw->is_v2_card ? "V2/V3" : "V1");
311 printk(KERN_INFO IPWIRELESS_PCCARD_NAME 301 printk(KERN_INFO IPWIRELESS_PCCARD_NAME
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index 90924fb00481..8861ca477dd9 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -493,7 +493,6 @@ static int pcmciamtd_config(struct pcmcia_device *link)
493 int last_ret = 0, last_fn = 0; 493 int last_ret = 0, last_fn = 0;
494 int ret; 494 int ret;
495 int i; 495 int i;
496 config_info_t t;
497 static char *probes[] = { "jedec_probe", "cfi_probe" }; 496 static char *probes[] = { "jedec_probe", "cfi_probe" };
498 int new_name = 0; 497 int new_name = 0;
499 498
@@ -571,10 +570,7 @@ static int pcmciamtd_config(struct pcmcia_device *link)
571 dev->pcmcia_map.map_priv_1 = (unsigned long)dev; 570 dev->pcmcia_map.map_priv_1 = (unsigned long)dev;
572 dev->pcmcia_map.map_priv_2 = (unsigned long)link->win; 571 dev->pcmcia_map.map_priv_2 = (unsigned long)link->win;
573 572
574 DEBUG(2, "Getting configuration"); 573 dev->vpp = (vpp) ? vpp : link->socket.socket.Vpp;
575 CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &t));
576 DEBUG(2, "Vcc = %d Vpp1 = %d Vpp2 = %d", t.Vcc, t.Vpp1, t.Vpp2);
577 dev->vpp = (vpp) ? vpp : t.Vpp1;
578 link->conf.Attributes = 0; 574 link->conf.Attributes = 0;
579 if(setvpp == 2) { 575 if(setvpp == 2) {
580 link->conf.Vpp = dev->vpp; 576 link->conf.Vpp = dev->vpp;
@@ -583,13 +579,7 @@ static int pcmciamtd_config(struct pcmcia_device *link)
583 } 579 }
584 580
585 link->conf.IntType = INT_MEMORY; 581 link->conf.IntType = INT_MEMORY;
586 link->conf.ConfigBase = t.ConfigBase;
587 link->conf.Status = t.Status;
588 link->conf.Pin = t.Pin;
589 link->conf.Copy = t.Copy;
590 link->conf.ExtStatus = t.ExtStatus;
591 link->conf.ConfigIndex = 0; 582 link->conf.ConfigIndex = 0;
592 link->conf.Present = t.Present;
593 DEBUG(2, "Setting Configuration"); 583 DEBUG(2, "Setting Configuration");
594 ret = pcmcia_request_configuration(link, &link->conf); 584 ret = pcmcia_request_configuration(link, &link->conf);
595 if(ret != CS_SUCCESS) { 585 if(ret != CS_SUCCESS) {
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index 7e00e672bfe7..344e570fbb6f 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -488,23 +488,23 @@ static int simple_config_check_notpicky(struct pcmcia_device *p_dev,
488static int simple_config(struct pcmcia_device *link) 488static int simple_config(struct pcmcia_device *link)
489{ 489{
490 struct serial_info *info = link->priv; 490 struct serial_info *info = link->priv;
491 config_info_t config; 491 int i = -ENODEV, try;
492 int i, try;
493 492
494 /* If the card is already configured, look up the port and irq */ 493 /* If the card is already configured, look up the port and irq */
495 i = pcmcia_get_configuration_info(link, &config); 494 if (link->function_config) {
496 if ((i == CS_SUCCESS) && (config.Attributes & CONF_VALID_CLIENT)) {
497 unsigned int port = 0; 495 unsigned int port = 0;
498 if ((config.BasePort2 != 0) && (config.NumPorts2 == 8)) { 496 if ((link->io.BasePort2 != 0) &&
499 port = config.BasePort2; 497 (link->io.NumPorts2 == 8)) {
498 port = link->io.BasePort2;
500 info->slave = 1; 499 info->slave = 1;
501 } else if ((info->manfid == MANFID_OSITECH) && 500 } else if ((info->manfid == MANFID_OSITECH) &&
502 (config.NumPorts1 == 0x40)) { 501 (link->io.NumPorts1 == 0x40)) {
503 port = config.BasePort1 + 0x28; 502 port = link->io.BasePort1 + 0x28;
504 info->slave = 1; 503 info->slave = 1;
505 } 504 }
506 if (info->slave) { 505 if (info->slave) {
507 return setup_serial(link, info, port, config.AssignedIRQ); 506 return setup_serial(link, info, port,
507 link->irq.AssignedIRQ);
508 } 508 }
509 } 509 }
510 510