aboutsummaryrefslogtreecommitdiffstats
path: root/include/pcmcia/cs.h
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-07-29 12:35:47 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2010-09-29 11:20:22 -0400
commit7feabb6412ea23edd298c0fa90e5aa6733eb4a42 (patch)
treebfafe961aeb5449a71fbb389172b3a6c68b56e7c /include/pcmcia/cs.h
parent37979e1546a790c44adbc7f27a85569944480ebc (diff)
pcmcia: move config_{base,index,regs} to struct pcmcia_device
Several drivers prefer to explicitly set config_{base,index,regs}, formerly known as ConfigBase, ConfigIndex and Present. Instead of passing these values inside config_req_t, store it in struct pcmcia_device. 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 'include/pcmcia/cs.h')
-rw-r--r--include/pcmcia/cs.h15
1 files changed, 0 insertions, 15 deletions
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index 674edbc9ebef..47b6092c4ed6 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -22,9 +22,6 @@
22/* For RequestConfiguration */ 22/* For RequestConfiguration */
23typedef struct config_req_t { 23typedef struct config_req_t {
24 u_int Attributes; 24 u_int Attributes;
25 u_int ConfigBase;
26 u_char ConfigIndex;
27 u_int Present;
28} config_req_t; 25} config_req_t;
29 26
30/* Attributes for RequestConfiguration */ 27/* Attributes for RequestConfiguration */
@@ -35,16 +32,4 @@ typedef struct config_req_t {
35#define CONF_ENABLE_ESR 0x10 32#define CONF_ENABLE_ESR 0x10
36#define CONF_VALID_CLIENT 0x100 33#define CONF_VALID_CLIENT 0x100
37 34
38/* Configuration registers present */
39#define PRESENT_OPTION 0x001
40#define PRESENT_STATUS 0x002
41#define PRESENT_PIN_REPLACE 0x004
42#define PRESENT_COPY 0x008
43#define PRESENT_EXT_STATUS 0x010
44#define PRESENT_IOBASE_0 0x020
45#define PRESENT_IOBASE_1 0x040
46#define PRESENT_IOBASE_2 0x080
47#define PRESENT_IOBASE_3 0x100
48#define PRESENT_IOSIZE 0x200
49
50#endif /* _LINUX_CS_H */ 35#endif /* _LINUX_CS_H */