aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hardware
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-07-29 13:27:09 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2010-09-29 11:20:23 -0400
commit1ac71e5a35eebee60cdcf15b3980bd94498f037b (patch)
tree22fa9342ccccce6a774af029ce51a526e55f8180 /drivers/isdn/hardware
parent7feabb6412ea23edd298c0fa90e5aa6733eb4a42 (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/isdn/hardware')
-rw-r--r--drivers/isdn/hardware/avm/avm_cs.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index 2d8bbbf286aa..6ea5cd28d349 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -20,7 +20,6 @@
20#include <asm/io.h> 20#include <asm/io.h>
21#include <asm/system.h> 21#include <asm/system.h>
22 22
23#include <pcmcia/cs.h>
24#include <pcmcia/cistpl.h> 23#include <pcmcia/cistpl.h>
25#include <pcmcia/ciscode.h> 24#include <pcmcia/ciscode.h>
26#include <pcmcia/ds.h> 25#include <pcmcia/ds.h>
@@ -79,7 +78,7 @@ static int avmcs_probe(struct pcmcia_device *p_dev)
79 p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; 78 p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
80 79
81 /* General socket configuration */ 80 /* General socket configuration */
82 p_dev->conf.Attributes = CONF_ENABLE_IRQ; 81 p_dev->config_flags |= CONF_ENABLE_IRQ;
83 p_dev->config_index = 1; 82 p_dev->config_index = 1;
84 p_dev->config_regs = PRESENT_OPTION; 83 p_dev->config_regs = PRESENT_OPTION;
85 84
@@ -149,7 +148,7 @@ static int avmcs_config(struct pcmcia_device *link)
149 /* 148 /*
150 * configure the PCMCIA socket 149 * configure the PCMCIA socket
151 */ 150 */
152 i = pcmcia_request_configuration(link, &link->conf); 151 i = pcmcia_enable_device(link);
153 if (i != 0) { 152 if (i != 0) {
154 pcmcia_disable_device(link); 153 pcmcia_disable_device(link);
155 break; 154 break;