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/hardware/avm/avm_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/hardware/avm/avm_cs.c')
-rw-r--r-- | drivers/isdn/hardware/avm/avm_cs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c index ee750e9456dd..a30c74fd75da 100644 --- a/drivers/isdn/hardware/avm/avm_cs.c +++ b/drivers/isdn/hardware/avm/avm_cs.c | |||
@@ -161,11 +161,6 @@ static dev_link_t *avmcs_attach(void) | |||
161 | link->next = dev_list; | 161 | link->next = dev_list; |
162 | dev_list = link; | 162 | dev_list = link; |
163 | client_reg.dev_info = &dev_info; | 163 | client_reg.dev_info = &dev_info; |
164 | client_reg.EventMask = | ||
165 | CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | | ||
166 | CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | | ||
167 | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; | ||
168 | client_reg.event_handler = &avmcs_event; | ||
169 | client_reg.Version = 0x0210; | 164 | client_reg.Version = 0x0210; |
170 | client_reg.event_callback_args.client_data = link; | 165 | client_reg.event_callback_args.client_data = link; |
171 | ret = pcmcia_register_client(&link->handle, &client_reg); | 166 | ret = pcmcia_register_client(&link->handle, &client_reg); |
@@ -500,6 +495,7 @@ static struct pcmcia_driver avmcs_driver = { | |||
500 | .name = "avm_cs", | 495 | .name = "avm_cs", |
501 | }, | 496 | }, |
502 | .attach = avmcs_attach, | 497 | .attach = avmcs_attach, |
498 | .event = avmcs_event, | ||
503 | .detach = avmcs_detach, | 499 | .detach = avmcs_detach, |
504 | .id_table = avmcs_ids, | 500 | .id_table = avmcs_ids, |
505 | }; | 501 | }; |