diff options
Diffstat (limited to 'include/pcmcia/ds.h')
-rw-r--r-- | include/pcmcia/ds.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h index cb8b6e6ce66c..8e2a96396478 100644 --- a/include/pcmcia/ds.h +++ b/include/pcmcia/ds.h | |||
@@ -133,10 +133,12 @@ typedef struct dev_link_t { | |||
133 | struct pcmcia_socket; | 133 | struct pcmcia_socket; |
134 | 134 | ||
135 | struct pcmcia_driver { | 135 | struct pcmcia_driver { |
136 | dev_link_t *(*attach)(void); | 136 | int (*probe) (struct pcmcia_device *dev); |
137 | int (*event) (event_t event, int priority, | 137 | void (*remove) (struct pcmcia_device *dev); |
138 | event_callback_args_t *); | 138 | |
139 | void (*detach)(dev_link_t *); | 139 | int (*suspend) (struct pcmcia_device *dev); |
140 | int (*resume) (struct pcmcia_device *dev); | ||
141 | |||
140 | struct module *owner; | 142 | struct module *owner; |
141 | struct pcmcia_device_id *id_table; | 143 | struct pcmcia_device_id *id_table; |
142 | struct device_driver drv; | 144 | struct device_driver drv; |
@@ -164,7 +166,6 @@ struct pcmcia_device { | |||
164 | /* deprecated, a cleaned up version will be moved into this | 166 | /* deprecated, a cleaned up version will be moved into this |
165 | struct soon */ | 167 | struct soon */ |
166 | dev_link_t *instance; | 168 | dev_link_t *instance; |
167 | event_callback_args_t event_callback_args; | ||
168 | u_int state; | 169 | u_int state; |
169 | 170 | ||
170 | /* information about this device */ | 171 | /* information about this device */ |
@@ -193,6 +194,8 @@ struct pcmcia_device { | |||
193 | #define handle_to_pdev(handle) (handle) | 194 | #define handle_to_pdev(handle) (handle) |
194 | #define handle_to_dev(handle) (handle->dev) | 195 | #define handle_to_dev(handle) (handle->dev) |
195 | 196 | ||
197 | #define dev_to_instance(dev) (dev->instance) | ||
198 | |||
196 | /* error reporting */ | 199 | /* error reporting */ |
197 | void cs_error(client_handle_t handle, int func, int ret); | 200 | void cs_error(client_handle_t handle, int func, int ret); |
198 | 201 | ||