aboutsummaryrefslogtreecommitdiffstats
path: root/include/pcmcia/ds.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/pcmcia/ds.h')
-rw-r--r--include/pcmcia/ds.h7
1 files changed, 1 insertions, 6 deletions
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 {
155 dev_node_t *dev_node; 155 dev_node_t *dev_node;
156 u_int state; 156 u_int state;
157 u_int open; 157 u_int open;
158 struct pcmcia_device *handle;
159 io_req_t io; 158 io_req_t io;
160 irq_req_t irq; 159 irq_req_t irq;
161 config_req_t conf; 160 config_req_t conf;
@@ -185,18 +184,14 @@ struct pcmcia_device {
185 struct pcmcia_driver * cardmgr; 184 struct pcmcia_driver * cardmgr;
186#endif 185#endif
187}; 186};
188typedef struct pcmcia_device dev_link_t;
189 187
190#define to_pcmcia_dev(n) container_of(n, struct pcmcia_device, dev) 188#define to_pcmcia_dev(n) container_of(n, struct pcmcia_device, dev)
191#define to_pcmcia_drv(n) container_of(n, struct pcmcia_driver, drv) 189#define to_pcmcia_drv(n) container_of(n, struct pcmcia_driver, drv)
192 190
193#define handle_to_pdev(handle) (handle)
194#define handle_to_dev(handle) (handle->dev) 191#define handle_to_dev(handle) (handle->dev)
195 192
196#define dev_to_instance(dev) (dev)
197
198/* error reporting */ 193/* error reporting */
199void cs_error(client_handle_t handle, int func, int ret); 194void cs_error(struct pcmcia_device *handle, int func, int ret);
200 195
201#endif /* __KERNEL__ */ 196#endif /* __KERNEL__ */
202#endif /* _LINUX_DS_H */ 197#endif /* _LINUX_DS_H */