diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-07-29 13:27:09 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-09-29 11:20:23 -0400 |
commit | 1ac71e5a35eebee60cdcf15b3980bd94498f037b (patch) | |
tree | 22fa9342ccccce6a774af029ce51a526e55f8180 /drivers/serial | |
parent | 7feabb6412ea23edd298c0fa90e5aa6733eb4a42 (diff) |
pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device
pcmcia_enable_device() now replaces pcmcia_request_configuration().
Instead of config_req_t, all necessary flags are either passed as
a parameter to pcmcia_enable_device(), or (in rare circumstances)
set in struct pcmcia_device -> flags.
With the last remaining user of include/pcmcia/cs.h gone, remove
all references.
CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-ide@vger.kernel.org
CC: linux-usb@vger.kernel.org
CC: laforge@gnumonks.org
CC: linux-mtd@lists.infradead.org
CC: alsa-devel@alsa-project.org
CC: linux-serial@vger.kernel.org
CC: Jiri Kosina <jkosina@suse.cz>
CC: linux-scsi@vger.kernel.org
Acked-by: Gustavo F. Padovan <padovan@profusion.mobi> (for drivers/bluetooth)
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/serial_cs.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c index ee19f2d25c20..47b1869026e7 100644 --- a/drivers/serial/serial_cs.c +++ b/drivers/serial/serial_cs.c | |||
@@ -45,7 +45,6 @@ | |||
45 | #include <asm/io.h> | 45 | #include <asm/io.h> |
46 | #include <asm/system.h> | 46 | #include <asm/system.h> |
47 | 47 | ||
48 | #include <pcmcia/cs.h> | ||
49 | #include <pcmcia/cistpl.h> | 48 | #include <pcmcia/cistpl.h> |
50 | #include <pcmcia/ciscode.h> | 49 | #include <pcmcia/ciscode.h> |
51 | #include <pcmcia/ds.h> | 50 | #include <pcmcia/ds.h> |
@@ -184,7 +183,7 @@ static void quirk_config_socket(struct pcmcia_device *link) | |||
184 | struct serial_info *info = link->priv; | 183 | struct serial_info *info = link->priv; |
185 | 184 | ||
186 | if (info->multi) | 185 | if (info->multi) |
187 | link->conf.Attributes |= CONF_ENABLE_ESR; | 186 | link->config_flags |= CONF_ENABLE_ESR; |
188 | } | 187 | } |
189 | 188 | ||
190 | static const struct serial_quirk quirks[] = { | 189 | static const struct serial_quirk quirks[] = { |
@@ -333,9 +332,9 @@ static int serial_probe(struct pcmcia_device *link) | |||
333 | info->p_dev = link; | 332 | info->p_dev = link; |
334 | link->priv = info; | 333 | link->priv = info; |
335 | 334 | ||
336 | link->conf.Attributes = CONF_ENABLE_IRQ; | 335 | link->config_flags |= CONF_ENABLE_IRQ; |
337 | if (do_sound) | 336 | if (do_sound) |
338 | link->conf.Attributes |= CONF_ENABLE_SPKR; | 337 | link->config_flags |= CONF_ENABLE_SPKR; |
339 | 338 | ||
340 | return serial_config(link); | 339 | return serial_config(link); |
341 | } | 340 | } |
@@ -503,7 +502,7 @@ found_port: | |||
503 | if (info->quirk && info->quirk->config) | 502 | if (info->quirk && info->quirk->config) |
504 | info->quirk->config(link); | 503 | info->quirk->config(link); |
505 | 504 | ||
506 | i = pcmcia_request_configuration(link, &link->conf); | 505 | i = pcmcia_enable_device(link); |
507 | if (i != 0) | 506 | if (i != 0) |
508 | return -1; | 507 | return -1; |
509 | return setup_serial(link, info, link->resource[0]->start, link->irq); | 508 | return setup_serial(link, info, link->resource[0]->start, link->irq); |
@@ -579,7 +578,7 @@ static int multi_config(struct pcmcia_device *link) | |||
579 | if (info->quirk && info->quirk->config) | 578 | if (info->quirk && info->quirk->config) |
580 | info->quirk->config(link); | 579 | info->quirk->config(link); |
581 | 580 | ||
582 | i = pcmcia_request_configuration(link, &link->conf); | 581 | i = pcmcia_enable_device(link); |
583 | if (i != 0) | 582 | if (i != 0) |
584 | return -ENODEV; | 583 | return -ENODEV; |
585 | 584 | ||