aboutsummaryrefslogtreecommitdiffstats
path: root/include/pcmcia
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2006-03-05 05:04:33 -0500
committerDominik Brodowski <linux@dominikbrodowski.net>2006-03-31 10:26:57 -0500
commit9940ec3617fec1db13e589bbc3f37e37878c7683 (patch)
treeed0547040dc815fe1e2039fc1cba1613d5308cc7 /include/pcmcia
parente2d4096365e06b9a3799afbadc28b4519c0b3526 (diff)
[PATCH] pcmcia: convert DEV_OK to pcmcia_dev_present
Instead of the DEV_OK macro, drivers should use pcmcia_dev_present(). Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'include/pcmcia')
-rw-r--r--include/pcmcia/cs.h1
-rw-r--r--include/pcmcia/ds.h12
2 files changed, 5 insertions, 8 deletions
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index e0835d612b7a..d5838c30d20f 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -390,6 +390,7 @@ int pcmcia_eject_card(struct pcmcia_socket *skt);
390int pcmcia_insert_card(struct pcmcia_socket *skt); 390int pcmcia_insert_card(struct pcmcia_socket *skt);
391int pccard_reset_card(struct pcmcia_socket *skt); 391int pccard_reset_card(struct pcmcia_socket *skt);
392 392
393struct pcmcia_device * pcmcia_dev_present(struct pcmcia_device *p_dev);
393void pcmcia_disable_device(struct pcmcia_device *p_dev); 394void pcmcia_disable_device(struct pcmcia_device *p_dev);
394 395
395struct pcmcia_socket * pcmcia_get_socket(struct pcmcia_socket *skt); 396struct pcmcia_socket * pcmcia_get_socket(struct pcmcia_socket *skt);
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index a8ce8fc11514..8c339f5678cf 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -104,12 +104,6 @@ typedef struct dev_node_t {
104 struct dev_node_t *next; 104 struct dev_node_t *next;
105} dev_node_t; 105} dev_node_t;
106 106
107#define pcmcia_dev_present(p_dev) \
108 (p_dev->socket->pcmcia_state.present)
109
110#define DEV_OK(l) \
111 ((l) && (!l->suspended) && pcmcia_dev_present(l))
112
113 107
114struct pcmcia_socket; 108struct pcmcia_socket;
115struct config_t; 109struct config_t;
@@ -155,8 +149,10 @@ struct pcmcia_device {
155 config_req_t conf; 149 config_req_t conf;
156 window_handle_t win; 150 window_handle_t win;
157 151
158 /* Is the device suspended? */ 152 /* Is the device suspended, or in the process of
153 * being removed? */
159 u16 suspended:1; 154 u16 suspended:1;
155 u16 _removed:1;
160 156
161 /* Flags whether io, irq, win configurations were 157 /* Flags whether io, irq, win configurations were
162 * requested, and whether the configuration is "locked" */ 158 * requested, and whether the configuration is "locked" */
@@ -174,7 +170,7 @@ struct pcmcia_device {
174 u16 has_card_id:1; 170 u16 has_card_id:1;
175 u16 has_func_id:1; 171 u16 has_func_id:1;
176 172
177 u16 reserved:4; 173 u16 reserved:3;
178 174
179 u8 func_id; 175 u8 func_id;
180 u16 manf_id; 176 u16 manf_id;