diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2005-07-07 20:59:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 21:24:05 -0400 |
commit | 1e212f3645a6b355de8c43a23376bc0e2ac49a63 (patch) | |
tree | 89324df417c19a1a63efb2ec6630e7d4b47181a0 /drivers/isdn/hisax/avma1_cs.c | |
parent | bf45d9b0ac108b11245203ebb082d30f5059846b (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 'drivers/isdn/hisax/avma1_cs.c')
-rw-r--r-- | drivers/isdn/hisax/avma1_cs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c index 67c60e04a37b..d3de0e856192 100644 --- a/drivers/isdn/hisax/avma1_cs.c +++ b/drivers/isdn/hisax/avma1_cs.c | |||
@@ -183,11 +183,6 @@ static dev_link_t *avma1cs_attach(void) | |||
183 | link->next = dev_list; | 183 | link->next = dev_list; |
184 | dev_list = link; | 184 | dev_list = link; |
185 | client_reg.dev_info = &dev_info; | 185 | client_reg.dev_info = &dev_info; |
186 | client_reg.EventMask = | ||
187 | CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | | ||
188 | CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | | ||
189 | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; | ||
190 | client_reg.event_handler = &avma1cs_event; | ||
191 | client_reg.Version = 0x0210; | 186 | client_reg.Version = 0x0210; |
192 | client_reg.event_callback_args.client_data = link; | 187 | client_reg.event_callback_args.client_data = link; |
193 | ret = pcmcia_register_client(&link->handle, &client_reg); | 188 | ret = pcmcia_register_client(&link->handle, &client_reg); |
@@ -514,6 +509,7 @@ static struct pcmcia_driver avma1cs_driver = { | |||
514 | .name = "avma1_cs", | 509 | .name = "avma1_cs", |
515 | }, | 510 | }, |
516 | .attach = avma1cs_attach, | 511 | .attach = avma1cs_attach, |
512 | .event = avma1cs_event, | ||
517 | .detach = avma1cs_detach, | 513 | .detach = avma1cs_detach, |
518 | .id_table = avma1cs_ids, | 514 | .id_table = avma1cs_ids, |
519 | }; | 515 | }; |