aboutsummaryrefslogtreecommitdiffstats
path: root/include/pcmcia/ds.h
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2005-07-07 20:59:00 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-07 21:24:05 -0400
commit1e212f3645a6b355de8c43a23376bc0e2ac49a63 (patch)
tree89324df417c19a1a63efb2ec6630e7d4b47181a0 /include/pcmcia/ds.h
parentbf45d9b0ac108b11245203ebb082d30f5059846b (diff)
[PATCH] pcmcia: move event handler
Move the "event handler" to struct pcmcia_driver -- the unified event handler will disappear really soon, but switching it to struct pcmcia_driver in the meantime allows for better "step-by-step" patches. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/pcmcia/ds.h')
-rw-r--r--include/pcmcia/ds.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index 2b52553f2d94..c574ff108148 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -133,6 +133,8 @@ struct pcmcia_socket;
133 133
134struct pcmcia_driver { 134struct pcmcia_driver {
135 dev_link_t *(*attach)(void); 135 dev_link_t *(*attach)(void);
136 int (*event) (event_t event, int priority,
137 event_callback_args_t *);
136 void (*detach)(dev_link_t *); 138 void (*detach)(dev_link_t *);
137 struct module *owner; 139 struct module *owner;
138 struct pcmcia_device_id *id_table; 140 struct pcmcia_device_id *id_table;
@@ -159,15 +161,13 @@ struct pcmcia_device {
159 /* deprecated, a cleaned up version will be moved into this 161 /* deprecated, a cleaned up version will be moved into this
160 struct soon */ 162 struct soon */
161 dev_link_t *instance; 163 dev_link_t *instance;
164 event_callback_args_t event_callback_args;
165
162 struct client_t { 166 struct client_t {
163 u_short client_magic; 167 u_short client_magic;
164 struct pcmcia_socket *Socket; 168 struct pcmcia_socket *Socket;
165 u_char Function; 169 u_char Function;
166 u_int state; 170 u_int state;
167 event_t EventMask;
168 int (*event_handler) (event_t event, int priority,
169 event_callback_args_t *);
170 event_callback_args_t event_callback_args;
171 } client; 171 } client;
172 172
173 /* information about this device */ 173 /* information about this device */