[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 <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Dominik Brodowski 2005-07-07 17:59:00 -07:00 • committed by Linus Torvalds
commit 1e212f3645
43 changed files with 85 additions and 245 deletions

View file

@ -133,6 +133,8 @@ struct pcmcia_socket;
struct pcmcia_driver {
dev_link_t *(*attach)(void);
int (*event) (event_t event, int priority,
event_callback_args_t *);
void (*detach)(dev_link_t *);
struct module *owner;
struct pcmcia_device_id *id_table;
@ -159,15 +161,13 @@ struct pcmcia_device {
/* deprecated, a cleaned up version will be moved into this
struct soon */
dev_link_t *instance;
event_callback_args_t event_callback_args;
struct client_t {
u_short client_magic;
struct pcmcia_socket *Socket;
u_char Function;
u_int state;
event_t EventMask;
int (*event_handler) (event_t event, int priority,
event_callback_args_t *);
event_callback_args_t event_callback_args;
} client;
/* information about this device */