[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, 6 insertions, 13 deletions

diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c
index 2d4f8e28478b..c8622f5f7c3a 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c
@@ -171,14 +171,6 @@ static dev_link_t *snd_pdacf_attach(void)
 
         /* Register with Card Services */
         client_reg.dev_info = &dev_info;
-        client_reg.EventMask = 
-                CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL
-#ifdef CONFIG_PM
-                | CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET
-                | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME
-#endif
-                ;
-        client_reg.event_handler = &pdacf_event;
         client_reg.Version = 0x0210;
         client_reg.event_callback_args.client_data = link;
 
@@ -387,12 +379,13 @@ static struct pcmcia_device_id snd_pdacf_ids[] = {
 MODULE_DEVICE_TABLE(pcmcia, snd_pdacf_ids);
 
 static struct pcmcia_driver pdacf_cs_driver = {
-        .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = "snd-pdaudiocf",
+        .owner          = THIS_MODULE,
+        .drv            = {
+                .name   = "snd-pdaudiocf",
         },
-        .attach         = snd_pdacf_attach,
-        .detach         = snd_pdacf_detach,
+        .attach         = snd_pdacf_attach,
+        .event          = pdacf_event,
+        .detach         = snd_pdacf_detach,
         .id_table       = snd_pdacf_ids,
 };