diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-02 10:12:00 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-22 19:22:52 -0400 |
commit | ad913c11928f51abb6174f165db8d8d205b22e21 (patch) | |
tree | a8542c846afb4950a12f46b16c1eacfa2280971a /drivers/serial/serial_cs.c | |
parent | 8e2fc39ddea7fe8c6798837da282db88a09af793 (diff) |
pcmcia: pcmcia_config_loop() improvement by passing vcc
By passing the current Vcc setting to the pcmcia_config_loop callback
function, we can remove pcmcia_get_configuration_info() calls from many
drivers.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/serial/serial_cs.c')
-rw-r--r-- | drivers/serial/serial_cs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c index f8658686439d..7e00e672bfe7 100644 --- a/drivers/serial/serial_cs.c +++ b/drivers/serial/serial_cs.c | |||
@@ -444,6 +444,7 @@ first_tuple(struct pcmcia_device *handle, tuple_t * tuple, cisparse_t * parse) | |||
444 | static int simple_config_check(struct pcmcia_device *p_dev, | 444 | static int simple_config_check(struct pcmcia_device *p_dev, |
445 | cistpl_cftable_entry_t *cf, | 445 | cistpl_cftable_entry_t *cf, |
446 | cistpl_cftable_entry_t *dflt, | 446 | cistpl_cftable_entry_t *dflt, |
447 | unsigned int vcc, | ||
447 | void *priv_data) | 448 | void *priv_data) |
448 | { | 449 | { |
449 | static const int size_table[2] = { 8, 16 }; | 450 | static const int size_table[2] = { 8, 16 }; |
@@ -467,6 +468,7 @@ static int simple_config_check(struct pcmcia_device *p_dev, | |||
467 | static int simple_config_check_notpicky(struct pcmcia_device *p_dev, | 468 | static int simple_config_check_notpicky(struct pcmcia_device *p_dev, |
468 | cistpl_cftable_entry_t *cf, | 469 | cistpl_cftable_entry_t *cf, |
469 | cistpl_cftable_entry_t *dflt, | 470 | cistpl_cftable_entry_t *dflt, |
471 | unsigned int vcc, | ||
470 | void *priv_data) | 472 | void *priv_data) |
471 | { | 473 | { |
472 | static const unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 }; | 474 | static const unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 }; |
@@ -549,6 +551,7 @@ found_port: | |||
549 | static int multi_config_check(struct pcmcia_device *p_dev, | 551 | static int multi_config_check(struct pcmcia_device *p_dev, |
550 | cistpl_cftable_entry_t *cf, | 552 | cistpl_cftable_entry_t *cf, |
551 | cistpl_cftable_entry_t *dflt, | 553 | cistpl_cftable_entry_t *dflt, |
554 | unsigned int vcc, | ||
552 | void *priv_data) | 555 | void *priv_data) |
553 | { | 556 | { |
554 | int *base2 = priv_data; | 557 | int *base2 = priv_data; |
@@ -569,6 +572,7 @@ static int multi_config_check(struct pcmcia_device *p_dev, | |||
569 | static int multi_config_check_notpicky(struct pcmcia_device *p_dev, | 572 | static int multi_config_check_notpicky(struct pcmcia_device *p_dev, |
570 | cistpl_cftable_entry_t *cf, | 573 | cistpl_cftable_entry_t *cf, |
571 | cistpl_cftable_entry_t *dflt, | 574 | cistpl_cftable_entry_t *dflt, |
575 | unsigned int vcc, | ||
572 | void *priv_data) | 576 | void *priv_data) |
573 | { | 577 | { |
574 | int *base2 = priv_data; | 578 | int *base2 = priv_data; |