aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2005-07-07 20:59:00 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-07 21:24:05 -0400
commit1e212f3645a6b355de8c43a23376bc0e2ac49a63 (patch)
tree89324df417c19a1a63efb2ec6630e7d4b47181a0 /drivers/usb
parentbf45d9b0ac108b11245203ebb082d30f5059846b (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/usb')
-rw-r--r--drivers/usb/host/sl811_cs.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c
index 269d8ef01459..55dfeec6fdb5 100644
--- a/drivers/usb/host/sl811_cs.c
+++ b/drivers/usb/host/sl811_cs.c
@@ -389,11 +389,6 @@ static dev_link_t *sl811_cs_attach(void)
389 dev_list = link; 389 dev_list = link;
390 client_reg.dev_info = (dev_info_t *) &driver_name; 390 client_reg.dev_info = (dev_info_t *) &driver_name;
391 client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE; 391 client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
392 client_reg.EventMask =
393 CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
394 CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
395 CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
396 client_reg.event_handler = &sl811_cs_event;
397 client_reg.Version = 0x0210; 392 client_reg.Version = 0x0210;
398 client_reg.event_callback_args.client_data = link; 393 client_reg.event_callback_args.client_data = link;
399 ret = pcmcia_register_client(&link->handle, &client_reg); 394 ret = pcmcia_register_client(&link->handle, &client_reg);
@@ -418,6 +413,7 @@ static struct pcmcia_driver sl811_cs_driver = {
418 .name = (char *)driver_name, 413 .name = (char *)driver_name,
419 }, 414 },
420 .attach = sl811_cs_attach, 415 .attach = sl811_cs_attach,
416 .event = sl811_cs_event,
421 .detach = sl811_cs_detach, 417 .detach = sl811_cs_detach,
422 .id_table = sl811_ids, 418 .id_table = sl811_ids,
423}; 419};