aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/elsa_cs.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2005-07-07 20:59:00 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-07 21:24:05 -0400
commit1e212f3645a6b355de8c43a23376bc0e2ac49a63 (patch)
tree89324df417c19a1a63efb2ec6630e7d4b47181a0 /drivers/isdn/hisax/elsa_cs.c
parentbf45d9b0ac108b11245203ebb082d30f5059846b (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/elsa_cs.c')
-rw-r--r--drivers/isdn/hisax/elsa_cs.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c
index 9146be547044..54f0d68ad796 100644
--- a/drivers/isdn/hisax/elsa_cs.c
+++ b/drivers/isdn/hisax/elsa_cs.c
@@ -212,11 +212,6 @@ static dev_link_t *elsa_cs_attach(void)
212 link->next = dev_list; 212 link->next = dev_list;
213 dev_list = link; 213 dev_list = link;
214 client_reg.dev_info = &dev_info; 214 client_reg.dev_info = &dev_info;
215 client_reg.EventMask =
216 CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
217 CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
218 CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
219 client_reg.event_handler = &elsa_cs_event;
220 client_reg.Version = 0x0210; 215 client_reg.Version = 0x0210;
221 client_reg.event_callback_args.client_data = link; 216 client_reg.event_callback_args.client_data = link;
222 ret = pcmcia_register_client(&link->handle, &client_reg); 217 ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -521,6 +516,7 @@ static struct pcmcia_driver elsa_cs_driver = {
521 .name = "elsa_cs", 516 .name = "elsa_cs",
522 }, 517 },
523 .attach = elsa_cs_attach, 518 .attach = elsa_cs_attach,
519 .event = elsa_cs_event,
524 .detach = elsa_cs_detach, 520 .detach = elsa_cs_detach,
525 .id_table = elsa_ids, 521 .id_table = elsa_ids,
526}; 522};