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 /include | |
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 'include')
-rw-r--r-- | include/pcmcia/cs.h | 35 | ||||
-rw-r--r-- | include/pcmcia/ds.h | 17 | ||||
-rw-r--r-- | include/pcmcia/ss.h | 1 |
3 files changed, 11 insertions, 42 deletions
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h deleted file mode 100644 index 47b6092c4ed6..000000000000 --- a/include/pcmcia/cs.h +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | /* | ||
2 | * cs.h | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | * | ||
8 | * The initial developer of the original code is David A. Hinds | ||
9 | * <dahinds@users.sourceforge.net>. Portions created by David A. Hinds | ||
10 | * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. | ||
11 | * | ||
12 | * (C) 1999 David A. Hinds | ||
13 | */ | ||
14 | |||
15 | #ifndef _LINUX_CS_H | ||
16 | #define _LINUX_CS_H | ||
17 | |||
18 | #ifdef __KERNEL__ | ||
19 | #include <linux/interrupt.h> | ||
20 | #endif | ||
21 | |||
22 | /* For RequestConfiguration */ | ||
23 | typedef struct config_req_t { | ||
24 | u_int Attributes; | ||
25 | } config_req_t; | ||
26 | |||
27 | /* Attributes for RequestConfiguration */ | ||
28 | #define CONF_ENABLE_IRQ 0x01 | ||
29 | #define CONF_ENABLE_DMA 0x02 | ||
30 | #define CONF_ENABLE_SPKR 0x04 | ||
31 | #define CONF_ENABLE_PULSE_IRQ 0x08 | ||
32 | #define CONF_ENABLE_ESR 0x10 | ||
33 | #define CONF_VALID_CLIENT 0x100 | ||
34 | |||
35 | #endif /* _LINUX_CS_H */ | ||
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h index bc28f96d0b5a..50b03fd67fd6 100644 --- a/include/pcmcia/ds.h +++ b/include/pcmcia/ds.h | |||
@@ -24,9 +24,11 @@ | |||
24 | 24 | ||
25 | #ifdef __KERNEL__ | 25 | #ifdef __KERNEL__ |
26 | #include <linux/device.h> | 26 | #include <linux/device.h> |
27 | #include <linux/interrupt.h> | ||
27 | #include <pcmcia/ss.h> | 28 | #include <pcmcia/ss.h> |
28 | #include <asm/atomic.h> | 29 | #include <asm/atomic.h> |
29 | 30 | ||
31 | |||
30 | /* | 32 | /* |
31 | * PCMCIA device drivers (16-bit cards only; 32-bit cards require CardBus | 33 | * PCMCIA device drivers (16-bit cards only; 32-bit cards require CardBus |
32 | * a.k.a. PCI drivers | 34 | * a.k.a. PCI drivers |
@@ -88,18 +90,16 @@ struct pcmcia_device { | |||
88 | 90 | ||
89 | struct list_head socket_device_list; | 91 | struct list_head socket_device_list; |
90 | 92 | ||
91 | /* deprecated, will be cleaned up soon */ | ||
92 | config_req_t conf; | ||
93 | |||
94 | /* device setup */ | 93 | /* device setup */ |
95 | unsigned int irq; | 94 | unsigned int irq; |
96 | struct resource *resource[PCMCIA_NUM_RESOURCES]; | 95 | struct resource *resource[PCMCIA_NUM_RESOURCES]; |
97 | unsigned int vpp; | 96 | unsigned int vpp; |
98 | 97 | ||
99 | unsigned int io_lines; /* number of I/O lines */ | 98 | unsigned int config_flags; /* CONF_ENABLE_ flags below */ |
100 | unsigned int config_base; | 99 | unsigned int config_base; |
101 | unsigned int config_index; | 100 | unsigned int config_index; |
102 | unsigned int config_regs; /* PRESENT_ flags below */ | 101 | unsigned int config_regs; /* PRESENT_ flags below */ |
102 | unsigned int io_lines; /* number of I/O lines */ | ||
103 | 103 | ||
104 | /* Is the device suspended? */ | 104 | /* Is the device suspended? */ |
105 | u16 suspended:1; | 105 | u16 suspended:1; |
@@ -207,8 +207,7 @@ pcmcia_request_exclusive_irq(struct pcmcia_device *p_dev, | |||
207 | int __must_check pcmcia_request_irq(struct pcmcia_device *p_dev, | 207 | int __must_check pcmcia_request_irq(struct pcmcia_device *p_dev, |
208 | irq_handler_t handler); | 208 | irq_handler_t handler); |
209 | 209 | ||
210 | int pcmcia_request_configuration(struct pcmcia_device *p_dev, | 210 | int pcmcia_enable_device(struct pcmcia_device *p_dev); |
211 | config_req_t *req); | ||
212 | 211 | ||
213 | int pcmcia_request_window(struct pcmcia_device *p_dev, struct resource *res, | 212 | int pcmcia_request_window(struct pcmcia_device *p_dev, struct resource *res, |
214 | unsigned int speed); | 213 | unsigned int speed); |
@@ -265,6 +264,12 @@ static inline int pcmcia_io_cfg_data_width(unsigned int flags) | |||
265 | #define PRESENT_IOBASE_3 0x100 | 264 | #define PRESENT_IOBASE_3 0x100 |
266 | #define PRESENT_IOSIZE 0x200 | 265 | #define PRESENT_IOSIZE 0x200 |
267 | 266 | ||
267 | /* flags to be passed to pcmcia_enable_device() */ | ||
268 | #define CONF_ENABLE_IRQ 0x01 | ||
269 | #define CONF_ENABLE_SPKR 0x02 | ||
270 | #define CONF_ENABLE_PULSE_IRQ 0x04 | ||
271 | #define CONF_ENABLE_ESR 0x08 | ||
272 | |||
268 | #endif /* __KERNEL__ */ | 273 | #endif /* __KERNEL__ */ |
269 | 274 | ||
270 | #endif /* _LINUX_DS_H */ | 275 | #endif /* _LINUX_DS_H */ |
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h index 626b63c33d9e..731cde010f42 100644 --- a/include/pcmcia/ss.h +++ b/include/pcmcia/ss.h | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <linux/sched.h> /* task_struct, completion */ | 19 | #include <linux/sched.h> /* task_struct, completion */ |
20 | #include <linux/mutex.h> | 20 | #include <linux/mutex.h> |
21 | 21 | ||
22 | #include <pcmcia/cs.h> | ||
23 | #ifdef CONFIG_CARDBUS | 22 | #ifdef CONFIG_CARDBUS |
24 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
25 | #endif | 24 | #endif |