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/teles_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/teles_cs.c')
-rw-r--r-- | drivers/isdn/hisax/teles_cs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c index 107376ff5b9b..b8eeb789f901 100644 --- a/drivers/isdn/hisax/teles_cs.c +++ b/drivers/isdn/hisax/teles_cs.c | |||
@@ -193,11 +193,6 @@ static dev_link_t *teles_attach(void) | |||
193 | link->next = dev_list; | 193 | link->next = dev_list; |
194 | dev_list = link; | 194 | dev_list = link; |
195 | client_reg.dev_info = &dev_info; | 195 | client_reg.dev_info = &dev_info; |
196 | client_reg.EventMask = | ||
197 | CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | | ||
198 | CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | | ||
199 | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; | ||
200 | client_reg.event_handler = &teles_cs_event; | ||
201 | client_reg.Version = 0x0210; | 196 | client_reg.Version = 0x0210; |
202 | client_reg.event_callback_args.client_data = link; | 197 | client_reg.event_callback_args.client_data = link; |
203 | ret = pcmcia_register_client(&link->handle, &client_reg); | 198 | ret = pcmcia_register_client(&link->handle, &client_reg); |
@@ -501,6 +496,7 @@ static struct pcmcia_driver teles_cs_driver = { | |||
501 | .name = "teles_cs", | 496 | .name = "teles_cs", |
502 | }, | 497 | }, |
503 | .attach = teles_attach, | 498 | .attach = teles_attach, |
499 | .event = teles_cs_event, | ||
504 | .detach = teles_detach, | 500 | .detach = teles_detach, |
505 | .id_table = teles_ids, | 501 | .id_table = teles_ids, |
506 | }; | 502 | }; |