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/pcmcia/nmclan_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/pcmcia/nmclan_cs.c')
-rw-r--r-- | drivers/net/pcmcia/nmclan_cs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c index b86e7253fbfc..49124dc26b35 100644 --- a/drivers/net/pcmcia/nmclan_cs.c +++ b/drivers/net/pcmcia/nmclan_cs.c | |||
@@ -502,11 +502,6 @@ static dev_link_t *nmclan_attach(void) | |||
502 | link->next = dev_list; | 502 | link->next = dev_list; |
503 | dev_list = link; | 503 | dev_list = link; |
504 | client_reg.dev_info = &dev_info; | 504 | client_reg.dev_info = &dev_info; |
505 | client_reg.EventMask = | ||
506 | CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | | ||
507 | CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | | ||
508 | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; | ||
509 | client_reg.event_handler = &nmclan_event; | ||
510 | client_reg.Version = 0x0210; | 505 | client_reg.Version = 0x0210; |
511 | client_reg.event_callback_args.client_data = link; | 506 | client_reg.event_callback_args.client_data = link; |
512 | ret = pcmcia_register_client(&link->handle, &client_reg); | 507 | ret = pcmcia_register_client(&link->handle, &client_reg); |
@@ -1688,6 +1683,7 @@ static struct pcmcia_driver nmclan_cs_driver = { | |||
1688 | .name = "nmclan_cs", | 1683 | .name = "nmclan_cs", |
1689 | }, | 1684 | }, |
1690 | .attach = nmclan_attach, | 1685 | .attach = nmclan_attach, |
1686 | .event = nmclan_event, | ||
1691 | .detach = nmclan_detach, | 1687 | .detach = nmclan_detach, |
1692 | .id_table = nmclan_ids, | 1688 | .id_table = nmclan_ids, |
1693 | }; | 1689 | }; |