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/btuart_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/btuart_cs.c')
-rw-r--r-- | drivers/bluetooth/btuart_cs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c index c479484a1f7f..f15a9cf2b787 100644 --- a/drivers/bluetooth/btuart_cs.c +++ b/drivers/bluetooth/btuart_cs.c | |||
@@ -615,11 +615,6 @@ static dev_link_t *btuart_attach(void) | |||
615 | link->next = dev_list; | 615 | link->next = dev_list; |
616 | dev_list = link; | 616 | dev_list = link; |
617 | client_reg.dev_info = &dev_info; | 617 | client_reg.dev_info = &dev_info; |
618 | client_reg.EventMask = | ||
619 | CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | | ||
620 | CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | | ||
621 | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; | ||
622 | client_reg.event_handler = &btuart_event; | ||
623 | client_reg.Version = 0x0210; | 618 | client_reg.Version = 0x0210; |
624 | client_reg.event_callback_args.client_data = link; | 619 | client_reg.event_callback_args.client_data = link; |
625 | 620 | ||
@@ -867,6 +862,7 @@ static struct pcmcia_driver btuart_driver = { | |||
867 | .name = "btuart_cs", | 862 | .name = "btuart_cs", |
868 | }, | 863 | }, |
869 | .attach = btuart_attach, | 864 | .attach = btuart_attach, |
865 | .event = btuart_event, | ||
870 | .detach = btuart_detach, | 866 | .detach = btuart_detach, |
871 | .id_table = btuart_ids, | 867 | .id_table = btuart_ids, |
872 | }; | 868 | }; |