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/bluetooth/bluecard_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/bluetooth/bluecard_cs.c')
-rw-r--r-- | drivers/bluetooth/bluecard_cs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c index 5ef9adb9fe73..53661246100e 100644 --- a/drivers/bluetooth/bluecard_cs.c +++ b/drivers/bluetooth/bluecard_cs.c | |||
@@ -895,11 +895,6 @@ static dev_link_t *bluecard_attach(void) | |||
895 | link->next = dev_list; | 895 | link->next = dev_list; |
896 | dev_list = link; | 896 | dev_list = link; |
897 | client_reg.dev_info = &dev_info; | 897 | client_reg.dev_info = &dev_info; |
898 | client_reg.EventMask = | ||
899 | CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | | ||
900 | CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | | ||
901 | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; | ||
902 | client_reg.event_handler = &bluecard_event; | ||
903 | client_reg.Version = 0x0210; | 898 | client_reg.Version = 0x0210; |
904 | client_reg.event_callback_args.client_data = link; | 899 | client_reg.event_callback_args.client_data = link; |
905 | 900 | ||
@@ -1103,6 +1098,7 @@ static struct pcmcia_driver bluecard_driver = { | |||
1103 | .name = "bluecard_cs", | 1098 | .name = "bluecard_cs", |
1104 | }, | 1099 | }, |
1105 | .attach = bluecard_attach, | 1100 | .attach = bluecard_attach, |
1101 | .event = bluecard_event, | ||
1106 | .detach = bluecard_detach, | 1102 | .detach = bluecard_detach, |
1107 | .id_table = bluecard_ids, | 1103 | .id_table = bluecard_ids, |
1108 | }; | 1104 | }; |