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/3c574_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/3c574_cs.c')
-rw-r--r-- | drivers/net/pcmcia/3c574_cs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c index f0fc04bd37c4..c942964a49d2 100644 --- a/drivers/net/pcmcia/3c574_cs.c +++ b/drivers/net/pcmcia/3c574_cs.c | |||
@@ -312,11 +312,6 @@ static dev_link_t *tc574_attach(void) | |||
312 | link->next = dev_list; | 312 | link->next = dev_list; |
313 | dev_list = link; | 313 | dev_list = link; |
314 | client_reg.dev_info = &dev_info; | 314 | client_reg.dev_info = &dev_info; |
315 | client_reg.EventMask = | ||
316 | CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | | ||
317 | CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | | ||
318 | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; | ||
319 | client_reg.event_handler = &tc574_event; | ||
320 | client_reg.Version = 0x0210; | 315 | client_reg.Version = 0x0210; |
321 | client_reg.event_callback_args.client_data = link; | 316 | client_reg.event_callback_args.client_data = link; |
322 | ret = pcmcia_register_client(&link->handle, &client_reg); | 317 | ret = pcmcia_register_client(&link->handle, &client_reg); |
@@ -1299,6 +1294,7 @@ static struct pcmcia_driver tc574_driver = { | |||
1299 | .name = "3c574_cs", | 1294 | .name = "3c574_cs", |
1300 | }, | 1295 | }, |
1301 | .attach = tc574_attach, | 1296 | .attach = tc574_attach, |
1297 | .event = tc574_event, | ||
1302 | .detach = tc574_detach, | 1298 | .detach = tc574_detach, |
1303 | .id_table = tc574_ids, | 1299 | .id_table = tc574_ids, |
1304 | }; | 1300 | }; |