[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>

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;
 
 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 */