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/serial | |
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/serial')
-rw-r--r-- | drivers/serial/serial_cs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c index 73a34b18866f..83bfd11a1cc4 100644 --- a/drivers/serial/serial_cs.c +++ b/drivers/serial/serial_cs.c | |||
@@ -232,11 +232,6 @@ static dev_link_t *serial_attach(void) | |||
232 | link->next = dev_list; | 232 | link->next = dev_list; |
233 | dev_list = link; | 233 | dev_list = link; |
234 | client_reg.dev_info = &dev_info; | 234 | client_reg.dev_info = &dev_info; |
235 | client_reg.EventMask = | ||
236 | CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | | ||
237 | CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | | ||
238 | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; | ||
239 | client_reg.event_handler = &serial_event; | ||
240 | client_reg.Version = 0x0210; | 235 | client_reg.Version = 0x0210; |
241 | client_reg.event_callback_args.client_data = link; | 236 | client_reg.event_callback_args.client_data = link; |
242 | ret = pcmcia_register_client(&link->handle, &client_reg); | 237 | ret = pcmcia_register_client(&link->handle, &client_reg); |
@@ -883,6 +878,7 @@ static struct pcmcia_driver serial_cs_driver = { | |||
883 | .name = "serial_cs", | 878 | .name = "serial_cs", |
884 | }, | 879 | }, |
885 | .attach = serial_attach, | 880 | .attach = serial_attach, |
881 | .event = serial_event, | ||
886 | .detach = serial_detach, | 882 | .detach = serial_detach, |
887 | .id_table = serial_ids, | 883 | .id_table = serial_ids, |
888 | }; | 884 | }; |