aboutsummaryrefslogtreecommitdiffstats
path: root/include/pcmcia
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-07-21 08:43:05 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2010-07-30 15:07:37 -0400
commitce3f9d71bd9c4268698109ad425625a2a8f51e22 (patch)
tree31f1c514199da5aabae02ac4aeab31f6343fe324 /include/pcmcia
parent134716f19bc53dc22e8aba34f2af195b805328b5 (diff)
pcmcia: remove unused flag, simplify headers
As we only provide one way to set up resources now, we can remove the resource-setup-related bitfield (except resource_setup_done). In addition, pcmcia_state only consisted of one entry, so remove this bitfield as well. Suggested-by: Komuro <komurojun-mbn@nifty.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'include/pcmcia')
-rw-r--r--include/pcmcia/ss.h18
1 files changed, 3 insertions, 15 deletions
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index 66740b764da7..aeac27109839 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -162,17 +162,10 @@ struct pcmcia_socket {
162 u_int pci_irq; 162 u_int pci_irq;
163 struct pci_dev *cb_dev; 163 struct pci_dev *cb_dev;
164 164
165
166 /* socket setup is done so resources should be able to be allocated. 165 /* socket setup is done so resources should be able to be allocated.
167 * Only if set to 1, calls to find_{io,mem}_region are handled, and 166 * Only if set to 1, calls to find_{io,mem}_region are handled, and
168 * insertio events are actually managed by the PCMCIA layer.*/ 167 * insertio events are actually managed by the PCMCIA layer.*/
169 u8 resource_setup_done:1; 168 u8 resource_setup_done;
170
171 /* It's old if resource setup is done using adjust_resource_info() */
172 u8 resource_setup_old:1;
173 u8 resource_setup_new:1;
174
175 u8 reserved:5;
176 169
177 /* socket operations */ 170 /* socket operations */
178 struct pccard_operations *ops; 171 struct pccard_operations *ops;
@@ -218,13 +211,8 @@ struct pcmcia_socket {
218 * incorrectness and change */ 211 * incorrectness and change */
219 u8 device_count; 212 u8 device_count;
220 213
221 /* 16-bit state: */ 214 /* does the PCMCIA card consist of two pseudo devices? */
222 struct { 215 u8 pcmcia_pfc;
223 /* the PCMCIA card consists of two pseudo devices */
224 u8 has_pfc:1;
225
226 u8 reserved:7;
227 } pcmcia_state;
228 216
229 /* non-zero if PCMCIA card is present */ 217 /* non-zero if PCMCIA card is present */
230 atomic_t present; 218 atomic_t present;