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);
 int pcmcia_insert_card(struct pcmcia_socket *skt);
 int pccard_reset_card(struct pcmcia_socket *skt);
 
+struct pcmcia_device * pcmcia_dev_present(struct pcmcia_device *p_dev);
 void pcmcia_disable_device(struct pcmcia_device *p_dev);
 
 struct 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 {
     struct dev_node_t   *next;
 } dev_node_t;
 
-#define pcmcia_dev_present(p_dev) \
-    (p_dev->socket->pcmcia_state.present)
-
-#define DEV_OK(l) \
-    ((l) && (!l->suspended) && pcmcia_dev_present(l))
-
 
 struct pcmcia_socket;
 struct config_t;
@@ -155,8 +149,10 @@ struct pcmcia_device {
         config_req_t            conf;
         window_handle_t         win;
 
-        /* Is the device suspended? */
+        /* Is the device suspended, or in the process of
+         * being removed? */
         u16                     suspended:1;
+        u16                     _removed:1;
 
         /* Flags whether io, irq, win configurations were
          * requested, and whether the configuration is "locked" */
@@ -174,7 +170,7 @@ struct pcmcia_device {
         u16                     has_card_id:1;
         u16                     has_func_id:1;
 
-        u16                     reserved:4;
+        u16                     reserved:3;
 
         u8                      func_id;
         u16                     manf_id;