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/parport | |
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/parport')
-rw-r--r-- | drivers/parport/parport_cs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c index 05f34e73694b..b1899e9c1f65 100644 --- a/drivers/parport/parport_cs.c +++ b/drivers/parport/parport_cs.c | |||
@@ -152,6 +152,7 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | |||
152 | static int parport_config_check(struct pcmcia_device *p_dev, | 152 | static int parport_config_check(struct pcmcia_device *p_dev, |
153 | cistpl_cftable_entry_t *cfg, | 153 | cistpl_cftable_entry_t *cfg, |
154 | cistpl_cftable_entry_t *dflt, | 154 | cistpl_cftable_entry_t *dflt, |
155 | unsigned int vcc, | ||
155 | void *priv_data) | 156 | void *priv_data) |
156 | { | 157 | { |
157 | if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { | 158 | if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { |
@@ -169,6 +170,7 @@ static int parport_config_check(struct pcmcia_device *p_dev, | |||
169 | return -ENODEV; | 170 | return -ENODEV; |
170 | return 0; | 171 | return 0; |
171 | } | 172 | } |
173 | return -ENODEV; | ||
172 | } | 174 | } |
173 | 175 | ||
174 | static int parport_config(struct pcmcia_device *link) | 176 | static int parport_config(struct pcmcia_device *link) |