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/net/wireless/netwave_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/net/wireless/netwave_cs.c')
-rw-r--r-- | drivers/net/wireless/netwave_cs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c index e12bd75b269..bdd3e7083d9 100644 --- a/drivers/net/wireless/netwave_cs.c +++ b/drivers/net/wireless/netwave_cs.c | |||
@@ -491,11 +491,6 @@ static dev_link_t *netwave_attach(void) | |||
491 | link->next = dev_list; | 491 | link->next = dev_list; |
492 | dev_list = link; | 492 | dev_list = link; |
493 | client_reg.dev_info = &dev_info; | 493 | client_reg.dev_info = &dev_info; |
494 | client_reg.EventMask = | ||
495 | CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | | ||
496 | CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | | ||
497 | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; | ||
498 | client_reg.event_handler = &netwave_event; | ||
499 | client_reg.Version = 0x0210; | 494 | client_reg.Version = 0x0210; |
500 | client_reg.event_callback_args.client_data = link; | 495 | client_reg.event_callback_args.client_data = link; |
501 | ret = pcmcia_register_client(&link->handle, &client_reg); | 496 | ret = pcmcia_register_client(&link->handle, &client_reg); |
@@ -1680,6 +1675,7 @@ static struct pcmcia_driver netwave_driver = { | |||
1680 | .name = "netwave_cs", | 1675 | .name = "netwave_cs", |
1681 | }, | 1676 | }, |
1682 | .attach = netwave_attach, | 1677 | .attach = netwave_attach, |
1678 | .event = netwave_event, | ||
1683 | .detach = netwave_detach, | 1679 | .detach = netwave_detach, |
1684 | .id_table = netwave_ids, | 1680 | .id_table = netwave_ids, |
1685 | }; | 1681 | }; |