3 files changed, 4 insertions, 9 deletions

diff --git a/include/pcmcia/bulkmem.h b/include/pcmcia/bulkmem.h
index b53b78d497ba..6bc7472293b2 100644
--- a/include/pcmcia/bulkmem.h
+++ b/include/pcmcia/bulkmem.h
@@ -35,7 +35,7 @@ typedef struct region_info_t {
 #define REGION_BAR_MASK         0xe000
 #define REGION_BAR_SHIFT        13
 
-int pcmcia_get_first_region(client_handle_t handle, region_info_t *rgn);
-int pcmcia_get_next_region(client_handle_t handle, region_info_t *rgn);
+int pcmcia_get_first_region(struct pcmcia_device *handle, region_info_t *rgn);
+int pcmcia_get_next_region(struct pcmcia_device *handle, region_info_t *rgn);
 
 #endif /* _LINUX_BULKMEM_H */
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index 61f7d2dec199..557d8aea1a86 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -155,7 +155,6 @@ struct pcmcia_device {
         dev_node_t              *dev_node;
         u_int                   state;
         u_int                   open;
-        struct pcmcia_device    *handle;
         io_req_t                io;
         irq_req_t               irq;
         config_req_t            conf;
@@ -185,18 +184,14 @@ struct pcmcia_device {
         struct pcmcia_driver *  cardmgr;
 #endif
 };
-typedef struct pcmcia_device dev_link_t;
 
 #define to_pcmcia_dev(n) container_of(n, struct pcmcia_device, dev)
 #define to_pcmcia_drv(n) container_of(n, struct pcmcia_driver, drv)
 
-#define handle_to_pdev(handle) (handle)
 #define handle_to_dev(handle) (handle->dev)
 
-#define dev_to_instance(dev) (dev)
-
 /* error reporting */
-void cs_error(client_handle_t handle, int func, int ret);
+void cs_error(struct pcmcia_device *handle, int func, int ret);
 
 #endif /* __KERNEL__ */
 #endif /* _LINUX_DS_H */
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index d0a15125f241..35e469dea6ec 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -161,7 +161,7 @@ typedef struct io_window_t {
 typedef struct window_t {
         u_short                 magic;
         u_short                 index;
-        client_handle_t         handle;
+        struct pcmcia_device    *handle;
         struct pcmcia_socket    *sock;
         pccard_mem_map          ctl;
 } window_t;