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/dtl1_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/dtl1_cs.c')
-rw-r--r-- | drivers/bluetooth/dtl1_cs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c index bb12f7daeb91..58b09a9cc4c6 100644 --- a/drivers/bluetooth/dtl1_cs.c +++ b/drivers/bluetooth/dtl1_cs.c | |||
@@ -594,11 +594,6 @@ static dev_link_t *dtl1_attach(void) | |||
594 | link->next = dev_list; | 594 | link->next = dev_list; |
595 | dev_list = link; | 595 | dev_list = link; |
596 | client_reg.dev_info = &dev_info; | 596 | client_reg.dev_info = &dev_info; |
597 | client_reg.EventMask = | ||
598 | CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | | ||
599 | CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | | ||
600 | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; | ||
601 | client_reg.event_handler = &dtl1_event; | ||
602 | client_reg.Version = 0x0210; | 597 | client_reg.Version = 0x0210; |
603 | client_reg.event_callback_args.client_data = link; | 598 | client_reg.event_callback_args.client_data = link; |
604 | 599 | ||
@@ -820,6 +815,7 @@ static struct pcmcia_driver dtl1_driver = { | |||
820 | .name = "dtl1_cs", | 815 | .name = "dtl1_cs", |
821 | }, | 816 | }, |
822 | .attach = dtl1_attach, | 817 | .attach = dtl1_attach, |
818 | .event = dtl1_event, | ||
823 | .detach = dtl1_detach, | 819 | .detach = dtl1_detach, |
824 | .id_table = dtl1_ids, | 820 | .id_table = dtl1_ids, |
825 | }; | 821 | }; |