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/parport/parport_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/parport/parport_cs.c')
-rw-r--r-- | drivers/parport/parport_cs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c index ff45662c4f7c..ad8921a260ec 100644 --- a/drivers/parport/parport_cs.c +++ b/drivers/parport/parport_cs.c | |||
@@ -133,11 +133,6 @@ static dev_link_t *parport_attach(void) | |||
133 | link->next = dev_list; | 133 | link->next = dev_list; |
134 | dev_list = link; | 134 | dev_list = link; |
135 | client_reg.dev_info = &dev_info; | 135 | client_reg.dev_info = &dev_info; |
136 | client_reg.EventMask = | ||
137 | CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | | ||
138 | CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | | ||
139 | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; | ||
140 | client_reg.event_handler = &parport_event; | ||
141 | client_reg.Version = 0x0210; | 136 | client_reg.Version = 0x0210; |
142 | client_reg.event_callback_args.client_data = link; | 137 | client_reg.event_callback_args.client_data = link; |
143 | ret = pcmcia_register_client(&link->handle, &client_reg); | 138 | ret = pcmcia_register_client(&link->handle, &client_reg); |
@@ -386,6 +381,7 @@ static struct pcmcia_driver parport_cs_driver = { | |||
386 | .name = "parport_cs", | 381 | .name = "parport_cs", |
387 | }, | 382 | }, |
388 | .attach = parport_attach, | 383 | .attach = parport_attach, |
384 | .event = parport_event, | ||
389 | .detach = parport_detach, | 385 | .detach = parport_detach, |
390 | .id_table = parport_ids, | 386 | .id_table = parport_ids, |
391 | 387 | ||