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/bt3c_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/bt3c_cs.c')
-rw-r--r-- | drivers/bluetooth/bt3c_cs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index 9013cd759afb..06539a542e98 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c | |||
@@ -696,11 +696,6 @@ static dev_link_t *bt3c_attach(void) | |||
696 | link->next = dev_list; | 696 | link->next = dev_list; |
697 | dev_list = link; | 697 | dev_list = link; |
698 | client_reg.dev_info = &dev_info; | 698 | client_reg.dev_info = &dev_info; |
699 | client_reg.EventMask = | ||
700 | CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | | ||
701 | CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | | ||
702 | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; | ||
703 | client_reg.event_handler = &bt3c_event; | ||
704 | client_reg.Version = 0x0210; | 699 | client_reg.Version = 0x0210; |
705 | client_reg.event_callback_args.client_data = link; | 700 | client_reg.event_callback_args.client_data = link; |
706 | 701 | ||
@@ -947,6 +942,7 @@ static struct pcmcia_driver bt3c_driver = { | |||
947 | .name = "bt3c_cs", | 942 | .name = "bt3c_cs", |
948 | }, | 943 | }, |
949 | .attach = bt3c_attach, | 944 | .attach = bt3c_attach, |
945 | .event = bt3c_event, | ||
950 | .detach = bt3c_detach, | 946 | .detach = bt3c_detach, |
951 | .id_table = bt3c_ids, | 947 | .id_table = bt3c_ids, |
952 | }; | 948 | }; |