Index: 2.6.10/drivers/bluetooth/bluecard_cs.c =================================================================== --- 2.6.10.orig/drivers/bluetooth/bluecard_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/bluetooth/bluecard_cs.c 2004-12-29 11:58:33.287425987 +0100 @@ -891,11 +891,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &bluecard_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; @@ -1098,6 +1093,7 @@ .name = "bluecard_cs", }, .attach = bluecard_attach, + .event = bluecard_event, .detach = bluecard_detach, .id_table = bluecard_ids, }; Index: 2.6.10/drivers/bluetooth/bt3c_cs.c =================================================================== --- 2.6.10.orig/drivers/bluetooth/bt3c_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/bluetooth/bt3c_cs.c 2004-12-29 11:58:33.304423596 +0100 @@ -696,11 +696,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &bt3c_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; @@ -946,6 +941,7 @@ .name = "bt3c_cs", }, .attach = bt3c_attach, + .event = bt3c_event, .detach = bt3c_detach, .id_table = bt3c_ids, }; Index: 2.6.10/drivers/bluetooth/btuart_cs.c =================================================================== --- 2.6.10.orig/drivers/bluetooth/btuart_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/bluetooth/btuart_cs.c 2004-12-29 11:58:33.311422612 +0100 @@ -615,11 +615,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &btuart_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; @@ -870,6 +865,7 @@ .name = "btuart_cs", }, .attach = btuart_attach, + .event = btuart_event, .detach = btuart_detach, .id_table = btuart_ids, }; Index: 2.6.10/drivers/bluetooth/dtl1_cs.c =================================================================== --- 2.6.10.orig/drivers/bluetooth/dtl1_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/bluetooth/dtl1_cs.c 2004-12-29 11:58:33.313422330 +0100 @@ -594,11 +594,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &dtl1_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; @@ -819,6 +814,7 @@ .name = "dtl1_cs", }, .attach = dtl1_attach, + .event = dtl1_event, .detach = dtl1_detach, .id_table = dtl1_ids, }; Index: 2.6.10/drivers/char/pcmcia/synclink_cs.c =================================================================== --- 2.6.10.orig/drivers/char/pcmcia/synclink_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/char/pcmcia/synclink_cs.c 2004-12-29 11:58:33.432405596 +0100 @@ -593,11 +593,6 @@ dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &mgslpc_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; @@ -3092,6 +3087,7 @@ .name = "synclink_cs", }, .attach = mgslpc_attach, + .event = mgslpc_event, .detach = mgslpc_detach, .id_table = mgslpc_ids, }; Index: 2.6.10/drivers/ide/legacy/ide-cs.c =================================================================== --- 2.6.10.orig/drivers/ide/legacy/ide-cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/ide/legacy/ide-cs.c 2004-12-29 11:58:33.498396314 +0100 @@ -134,11 +134,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &ide_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -495,6 +490,7 @@ .name = "ide-cs", }, .attach = ide_attach, + .event = ide_event, .detach = ide_detach, .id_table = ide_ids, }; Index: 2.6.10/drivers/isdn/hardware/avm/avm_cs.c =================================================================== --- 2.6.10.orig/drivers/isdn/hardware/avm/avm_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/isdn/hardware/avm/avm_cs.c 2004-12-29 11:58:33.541390267 +0100 @@ -161,11 +161,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &avmcs_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -499,6 +494,7 @@ .name = "avm_cs", }, .attach = avmcs_attach, + .event = avmcs_event, .detach = avmcs_detach, .id_table = avmcs_ids, }; Index: 2.6.10/drivers/isdn/hisax/avma1_cs.c =================================================================== --- 2.6.10.orig/drivers/isdn/hisax/avma1_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/isdn/hisax/avma1_cs.c 2004-12-29 11:58:33.553388580 +0100 @@ -183,11 +183,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &avma1cs_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -513,6 +508,7 @@ .name = "avma1_cs", }, .attach = avma1cs_attach, + .event = avma1cs_event, .detach = avma1cs_detach, .id_table = avma1cs_ids, }; Index: 2.6.10/drivers/isdn/hisax/elsa_cs.c =================================================================== --- 2.6.10.orig/drivers/isdn/hisax/elsa_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/isdn/hisax/elsa_cs.c 2004-12-29 11:58:33.578385064 +0100 @@ -212,11 +212,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &elsa_cs_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -520,6 +515,7 @@ .name = "elsa_cs", }, .attach = elsa_cs_attach, + .event = elsa_cs_event, .detach = elsa_cs_detach, .id_table = elsa_ids, }; Index: 2.6.10/drivers/isdn/hisax/sedlbauer_cs.c =================================================================== --- 2.6.10.orig/drivers/isdn/hisax/sedlbauer_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/isdn/hisax/sedlbauer_cs.c 2004-12-29 11:58:33.581384642 +0100 @@ -226,11 +226,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &sedlbauer_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -633,6 +628,7 @@ .name = "sedlbauer_cs", }, .attach = sedlbauer_attach, + .event = sedlbauer_event, .detach = sedlbauer_detach, .id_table = sedlbauer_ids, }; Index: 2.6.10/drivers/isdn/hisax/teles_cs.c =================================================================== --- 2.6.10.orig/drivers/isdn/hisax/teles_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/isdn/hisax/teles_cs.c 2004-12-29 11:58:33.583384361 +0100 @@ -193,11 +193,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &teles_cs_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -501,6 +496,7 @@ .name = "teles_cs", }, .attach = teles_attach, + .event = teles_cs_event, .detach = teles_detach, .id_table = teles_ids, }; Index: 2.6.10/drivers/mtd/maps/pcmciamtd.c =================================================================== --- 2.6.10.orig/drivers/mtd/maps/pcmciamtd.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/mtd/maps/pcmciamtd.c 2004-12-29 11:58:33.618379439 +0100 @@ -800,11 +800,6 @@ /* Register with Card Services */ client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &pcmciamtd_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; DEBUG(2, "Calling RegisterClient"); @@ -846,6 +841,7 @@ .name = "pcmciamtd" }, .attach = pcmciamtd_attach, + .event = pcmciamtd_event, .detach = pcmciamtd_detach, .owner = THIS_MODULE, .id_table = pcmciamtd_ids, Index: 2.6.10/drivers/net/pcmcia/3c574_cs.c =================================================================== --- 2.6.10.orig/drivers/net/pcmcia/3c574_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/net/pcmcia/3c574_cs.c 2004-12-29 11:58:33.700367908 +0100 @@ -312,11 +312,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &tc574_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -1293,6 +1288,7 @@ .name = "3c574_cs", }, .attach = tc574_attach, + .event = tc574_event, .detach = tc574_detach, .id_table = tc574_ids, }; Index: 2.6.10/drivers/net/pcmcia/3c589_cs.c =================================================================== --- 2.6.10.orig/drivers/net/pcmcia/3c589_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/net/pcmcia/3c589_cs.c 2004-12-29 11:58:33.736362845 +0100 @@ -226,11 +226,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &tc589_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -1072,6 +1067,7 @@ .name = "3c589_cs", }, .attach = tc589_attach, + .event = tc589_event, .detach = tc589_detach, .id_table = tc589_ids, }; Index: 2.6.10/drivers/net/pcmcia/axnet_cs.c =================================================================== --- 2.6.10.orig/drivers/net/pcmcia/axnet_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/net/pcmcia/axnet_cs.c 2004-12-29 11:58:33.741362142 +0100 @@ -181,11 +181,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &axnet_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -881,6 +876,7 @@ .name = "axnet_cs", }, .attach = axnet_attach, + .event = axnet_event, .detach = axnet_detach, .id_table = axnet_ids, }; Index: 2.6.10/drivers/net/pcmcia/com20020_cs.c =================================================================== --- 2.6.10.orig/drivers/net/pcmcia/com20020_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/net/pcmcia/com20020_cs.c 2004-12-29 11:58:33.743361861 +0100 @@ -200,11 +200,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &com20020_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -494,6 +489,7 @@ .name = "com20020_cs", }, .attach = com20020_attach, + .event = com20020_event, .detach = com20020_detach, .id_table = com20020_ids, }; Index: 2.6.10/drivers/net/pcmcia/fmvj18x_cs.c =================================================================== --- 2.6.10.orig/drivers/net/pcmcia/fmvj18x_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/net/pcmcia/fmvj18x_cs.c 2004-12-29 11:58:33.746361439 +0100 @@ -288,11 +288,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &fmvj18x_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -792,6 +787,7 @@ .name = "fmvj18x_cs", }, .attach = fmvj18x_attach, + .event = fmvj18x_event, .detach = fmvj18x_detach, .id_table = fmvj18x_ids, }; Index: 2.6.10/drivers/net/pcmcia/ibmtr_cs.c =================================================================== --- 2.6.10.orig/drivers/net/pcmcia/ibmtr_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/net/pcmcia/ibmtr_cs.c 2004-12-29 11:58:33.756360033 +0100 @@ -193,11 +193,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &ibmtr_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -523,6 +518,7 @@ .name = "ibmtr_cs", }, .attach = ibmtr_attach, + .event = ibmtr_event, .detach = ibmtr_detach, .id_table = ibmtr_ids, }; Index: 2.6.10/drivers/net/pcmcia/nmclan_cs.c =================================================================== --- 2.6.10.orig/drivers/net/pcmcia/nmclan_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/net/pcmcia/nmclan_cs.c 2004-12-29 11:58:33.761359329 +0100 @@ -502,11 +502,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &nmclan_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -1687,6 +1682,7 @@ .name = "nmclan_cs", }, .attach = nmclan_attach, + .event = nmclan_event, .detach = nmclan_detach, .id_table = nmclan_ids, }; Index: 2.6.10/drivers/net/pcmcia/pcnet_cs.c =================================================================== --- 2.6.10.orig/drivers/net/pcmcia/pcnet_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/net/pcmcia/pcnet_cs.c 2004-12-29 11:58:33.765358767 +0100 @@ -276,11 +276,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &pcnet_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -1828,6 +1823,7 @@ .name = "pcnet_cs", }, .attach = pcnet_attach, + .event = pcnet_event, .detach = pcnet_detach, .owner = THIS_MODULE, .id_table = pcnet_ids, Index: 2.6.10/drivers/net/pcmcia/smc91c92_cs.c =================================================================== --- 2.6.10.orig/drivers/net/pcmcia/smc91c92_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/net/pcmcia/smc91c92_cs.c 2004-12-29 11:58:33.770358064 +0100 @@ -364,10 +364,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &smc91c92_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -2273,6 +2269,7 @@ .name = "smc91c92_cs", }, .attach = smc91c92_attach, + .event = smc91c92_event, .detach = smc91c92_detach, .id_table = smc91c92_ids, }; Index: 2.6.10/drivers/net/pcmcia/xirc2ps_cs.c =================================================================== --- 2.6.10.orig/drivers/net/pcmcia/xirc2ps_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/net/pcmcia/xirc2ps_cs.c 2004-12-29 11:58:33.773357642 +0100 @@ -624,11 +624,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &xirc2ps_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; if ((err = pcmcia_register_client(&link->handle, &client_reg))) { @@ -2021,6 +2016,7 @@ .name = "xirc2ps_cs", }, .attach = xirc2ps_attach, + .event = xirc2ps_event, .detach = xirc2ps_detach, .id_table = xirc2ps_ids, }; Index: 2.6.10/drivers/net/wireless/airo_cs.c =================================================================== --- 2.6.10.orig/drivers/net/wireless/airo_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/net/wireless/airo_cs.c 2004-12-29 11:58:33.788355533 +0100 @@ -212,11 +212,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &airo_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -575,6 +570,7 @@ .name = "airo_cs", }, .attach = airo_attach, + .event = airo_event, .detach = airo_detach, .id_table = airo_ids, }; Index: 2.6.10/drivers/net/wireless/atmel_cs.c =================================================================== --- 2.6.10.orig/drivers/net/wireless/atmel_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/net/wireless/atmel_cs.c 2004-12-29 11:58:33.789355392 +0100 @@ -224,11 +224,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &atmel_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -671,12 +666,13 @@ }; static struct pcmcia_driver atmel_driver = { - .owner = THIS_MODULE, - .drv = { - .name = "atmel_cs", + .owner = THIS_MODULE, + .drv = { + .name = "atmel_cs", }, - .attach = atmel_attach, - .detach = atmel_detach, + .attach = atmel_attach, + .event = atmel_event, + .detach = atmel_detach, .id_table = atmel_ids, }; Index: 2.6.10/drivers/net/wireless/netwave_cs.c =================================================================== --- 2.6.10.orig/drivers/net/wireless/netwave_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/net/wireless/netwave_cs.c 2004-12-29 11:58:33.803353423 +0100 @@ -491,11 +491,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &netwave_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -1679,6 +1674,7 @@ .name = "netwave_cs", }, .attach = netwave_attach, + .event = netwave_event, .detach = netwave_detach, .id_table = netwave_ids, }; Index: 2.6.10/drivers/net/wireless/orinoco_cs.c =================================================================== --- 2.6.10.orig/drivers/net/wireless/orinoco_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/net/wireless/orinoco_cs.c 2004-12-29 11:58:33.805353142 +0100 @@ -184,11 +184,6 @@ dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &orinoco_cs_event; client_reg.Version = 0x0210; /* FIXME: what does this mean? */ client_reg.event_callback_args.client_data = link; @@ -658,6 +653,7 @@ .name = DRIVER_NAME, }, .attach = orinoco_cs_attach, + .event = orinoco_cs_event, .detach = orinoco_cs_detach, .id_table = orinoco_cs_ids, }; Index: 2.6.10/drivers/net/wireless/ray_cs.c =================================================================== --- 2.6.10.orig/drivers/net/wireless/ray_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/net/wireless/ray_cs.c 2004-12-29 11:58:33.812352157 +0100 @@ -393,11 +393,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &ray_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; @@ -2914,6 +2909,7 @@ .name = "ray_cs", }, .attach = ray_attach, + .event = ray_event, .detach = ray_detach, .id_table = ray_ids, }; Index: 2.6.10/drivers/net/wireless/wavelan_cs.c =================================================================== --- 2.6.10.orig/drivers/net/wireless/wavelan_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/net/wireless/wavelan_cs.c 2004-12-29 11:58:33.819351173 +0100 @@ -4684,12 +4684,6 @@ /* Register with Card Services */ client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_REGISTRATION_COMPLETE | - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &wavelan_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; @@ -4903,6 +4897,7 @@ .name = "wavelan_cs", }, .attach = wavelan_attach, + .event = wavelan_event, .detach = wavelan_detach, .id_table = wavelan_ids, }; Index: 2.6.10/drivers/net/wireless/wl3501_cs.c =================================================================== --- 2.6.10.orig/drivers/net/wireless/wl3501_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/net/wireless/wl3501_cs.c 2004-12-29 11:58:33.822350751 +0100 @@ -2005,13 +2005,6 @@ link->next = wl3501_dev_list; wl3501_dev_list = link; client_reg.dev_info = &wl3501_dev_info; - client_reg.EventMask = CS_EVENT_CARD_INSERTION | - CS_EVENT_RESET_PHYSICAL | - CS_EVENT_CARD_RESET | - CS_EVENT_CARD_REMOVAL | - CS_EVENT_PM_SUSPEND | - CS_EVENT_PM_RESUME; - client_reg.event_handler = wl3501_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -2245,12 +2238,13 @@ }; static struct pcmcia_driver wl3501_driver = { - .owner = THIS_MODULE, - .drv = { - .name = "wl3501_cs", + .owner = THIS_MODULE, + .drv = { + .name = "wl3501_cs", }, - .attach = wl3501_attach, - .detach = wl3501_detach, + .attach = wl3501_attach, + .event = wl3501_event, + .detach = wl3501_detach, .id_table = wl3501_ids, }; Index: 2.6.10/drivers/parport/parport_cs.c =================================================================== --- 2.6.10.orig/drivers/parport/parport_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/parport/parport_cs.c 2004-12-29 11:58:33.854346251 +0100 @@ -133,11 +133,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &parport_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -385,6 +380,7 @@ .name = "parport_cs", }, .attach = parport_attach, + .event = parport_event, .detach = parport_detach, .id_table = parport_ids, Index: 2.6.10/drivers/pcmcia/cs_internal.h =================================================================== --- 2.6.10.orig/drivers/pcmcia/cs_internal.h 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/pcmcia/cs_internal.h 2004-12-29 11:58:33.865344704 +0100 @@ -114,9 +114,6 @@ #define CHECK_ERASEQ(q) \ (((q) == NULL) || ((q)->eraseq_magic != ERASEQ_MAGIC)) -#define EVENT(h, e, p) \ - ((h)->event_handler((e), (p), &(h)->event_callback_args)) - /* In cardbus.c */ int cb_alloc(struct pcmcia_socket *s); void cb_free(struct pcmcia_socket *s); Index: 2.6.10/drivers/pcmcia/ds.c =================================================================== --- 2.6.10.orig/drivers/pcmcia/ds.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/pcmcia/ds.c 2004-12-29 11:58:33.887341610 +0100 @@ -269,6 +269,10 @@ unsigned int i; u32 hash; + if (!p_drv->attach || !p_drv->event || !p_drv->detach) + printk(KERN_DEBUG "pcmcia: %s does misses a callback function", + p_drv->drv.name); + while (did && did->match_flags) { for (i=0; i<4; i++) { if (!did->prod_id[i]) @@ -944,6 +948,7 @@ static int send_event_callback(struct device *dev, void * _data) { struct pcmcia_device *p_dev = to_pcmcia_dev(dev); + struct pcmcia_driver *p_drv; struct send_event_data *data = _data; /* we get called for all sockets, but may only pass the event @@ -951,11 +956,17 @@ if (p_dev->socket != data->skt) return 0; + if (!p_dev->dev.driver) + return 0; + + p_drv = to_pcmcia_drv(p_dev->dev.driver); + if (p_dev->client.state & (CLIENT_UNBOUND|CLIENT_STALE)) return 0; - if (p_dev->client.EventMask & data->event) - return EVENT(&p_dev->client, data->event, data->priority); + if (p_drv->event) + return p_drv->event(data->event, data->priority, + &p_dev->event_callback_args); return 0; } @@ -1150,6 +1161,7 @@ struct pcmcia_socket *s; struct pcmcia_bus_socket *skt = NULL; struct pcmcia_device *p_dev = NULL; + struct pcmcia_driver *p_drv = NULL; /* Look for unbound client with matching dev_info */ down_read(&pcmcia_socket_list_rwsem); @@ -1167,7 +1179,6 @@ continue; spin_lock_irqsave(&pcmcia_dev_list_lock, flags); list_for_each_entry(p_dev, &skt->devices_list, socket_device_list) { - struct pcmcia_driver *p_drv; p_dev = pcmcia_get_dev(p_dev); if (!p_dev) continue; @@ -1197,10 +1208,8 @@ *handle = client; client->state &= ~CLIENT_UNBOUND; client->Socket = s; - client->EventMask = req->EventMask; - client->event_handler = req->event_handler; - client->event_callback_args = req->event_callback_args; - client->event_callback_args.client_handle = client; + p_dev->event_callback_args = req->event_callback_args; + p_dev->event_callback_args.client_handle = client; if (s->state & SOCKET_CARDBUS) client->state |= CLIENT_CARDBUS; @@ -1222,12 +1231,12 @@ ds_dbg(1, "register_client(): client 0x%p, dev %s\n", client, p_dev->dev.bus_id); - if (client->EventMask & CS_EVENT_REGISTRATION_COMPLETE) - EVENT(client, CS_EVENT_REGISTRATION_COMPLETE, CS_EVENT_PRI_LOW); if ((s->state & (SOCKET_PRESENT|SOCKET_CARDBUS)) == SOCKET_PRESENT) { - if (client->EventMask & CS_EVENT_CARD_INSERTION) - EVENT(client, CS_EVENT_CARD_INSERTION, CS_EVENT_PRI_LOW); + if (p_drv->event) + p_drv->event(CS_EVENT_CARD_INSERTION, CS_EVENT_PRI_LOW, + &p_dev->event_callback_args); + } return CS_SUCCESS; @@ -1384,7 +1393,6 @@ pcmcia_put_dev(p_dev); } else { handle->state = CLIENT_UNBOUND; - handle->event_handler = NULL; } return CS_SUCCESS; Index: 2.6.10/drivers/scsi/pcmcia/aha152x_stub.c =================================================================== --- 2.6.10.orig/drivers/scsi/pcmcia/aha152x_stub.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/scsi/pcmcia/aha152x_stub.c 2004-12-29 11:58:33.931335423 +0100 @@ -134,11 +134,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.event_handler = &aha152x_event; - client_reg.EventMask = - CS_EVENT_RESET_REQUEST | CS_EVENT_CARD_RESET | - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -333,6 +328,7 @@ .name = "aha152x_cs", }, .attach = aha152x_attach, + .event = aha152x_event, .detach = aha152x_detach, .id_table = aha152x_ids, }; Index: 2.6.10/drivers/scsi/pcmcia/fdomain_stub.c =================================================================== --- 2.6.10.orig/drivers/scsi/pcmcia/fdomain_stub.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/scsi/pcmcia/fdomain_stub.c 2004-12-29 11:58:33.932335282 +0100 @@ -120,11 +120,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.event_handler = &fdomain_event; - client_reg.EventMask = - CS_EVENT_RESET_REQUEST | CS_EVENT_CARD_RESET | - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -312,6 +307,7 @@ .name = "fdomain_cs", }, .attach = fdomain_attach, + .event = fdomain_event, .detach = fdomain_detach, .id_table = fdomain_ids, }; Index: 2.6.10/drivers/scsi/pcmcia/nsp_cs.c =================================================================== --- 2.6.10.orig/drivers/scsi/pcmcia/nsp_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/scsi/pcmcia/nsp_cs.c 2004-12-29 11:58:33.949332892 +0100 @@ -1657,11 +1657,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME ; - client_reg.event_handler = &nsp_cs_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -2152,12 +2147,13 @@ }; static struct pcmcia_driver nsp_driver = { - .owner = THIS_MODULE, - .drv = { - .name = "nsp_cs", + .owner = THIS_MODULE, + .drv = { + .name = "nsp_cs", }, - .attach = nsp_cs_attach, - .detach = nsp_cs_detach, + .attach = nsp_cs_attach, + .event = nsp_cs_event, + .detach = nsp_cs_detach, .id_table = nsp_cs_ids, }; #endif Index: 2.6.10/drivers/scsi/pcmcia/qlogic_stub.c =================================================================== --- 2.6.10.orig/drivers/scsi/pcmcia/qlogic_stub.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/scsi/pcmcia/qlogic_stub.c 2004-12-29 11:58:33.950332751 +0100 @@ -196,8 +196,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.event_handler = &qlogic_event; - client_reg.EventMask = CS_EVENT_RESET_REQUEST | CS_EVENT_CARD_RESET | CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -424,6 +422,7 @@ .name = "qlogic_cs", }, .attach = qlogic_attach, + .event = qlogic_event, .detach = qlogic_detach, .id_table = qlogic_ids, }; Index: 2.6.10/drivers/scsi/pcmcia/sym53c500_cs.c =================================================================== --- 2.6.10.orig/drivers/scsi/pcmcia/sym53c500_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/scsi/pcmcia/sym53c500_cs.c 2004-12-29 11:58:33.967330360 +0100 @@ -977,10 +977,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.event_handler = &SYM53C500_event; - client_reg.EventMask = CS_EVENT_RESET_REQUEST | CS_EVENT_CARD_RESET | - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -1010,6 +1006,7 @@ .name = "sym53c500_cs", }, .attach = SYM53C500_attach, + .event = SYM53C500_event, .detach = SYM53C500_detach, .id_table = sym53c500_ids, }; Index: 2.6.10/drivers/serial/serial_cs.c =================================================================== --- 2.6.10.orig/drivers/serial/serial_cs.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/serial/serial_cs.c 2004-12-29 11:58:33.987327548 +0100 @@ -225,11 +225,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &serial_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -828,6 +823,7 @@ .name = "serial_cs", }, .attach = serial_attach, + .event = serial_event, .detach = serial_detach, .id_table = serial_ids, }; Index: 2.6.10/drivers/telephony/ixj_pcmcia.c =================================================================== --- 2.6.10.orig/drivers/telephony/ixj_pcmcia.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/drivers/telephony/ixj_pcmcia.c 2004-12-29 11:58:34.023322485 +0100 @@ -69,11 +69,6 @@ link->next = dev_list; dev_list = link; client_reg.dev_info = &dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | - CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | - CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME; - client_reg.event_handler = &ixj_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; ret = pcmcia_register_client(&link->handle, &client_reg); @@ -306,6 +301,7 @@ .name = "ixj_cs", }, .attach = ixj_attach, + .event = ixj_event, .detach = ixj_detach, .id_table = ixj_ids, }; Index: 2.6.10/include/pcmcia/ds.h =================================================================== --- 2.6.10.orig/include/pcmcia/ds.h 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/include/pcmcia/ds.h 2004-12-29 11:58:34.104311094 +0100 @@ -135,6 +135,8 @@ struct pcmcia_driver { dev_link_t *(*attach)(void); + int (*event) (event_t event, int priority, + event_callback_args_t *); void (*detach)(dev_link_t *); struct module *owner; struct pcmcia_device_id *id_table; @@ -161,15 +163,13 @@ /* deprecated, a cleaned up version will be moved into this struct soon */ dev_link_t *instance; + event_callback_args_t event_callback_args; + struct client_t { u_short client_magic; struct pcmcia_socket *Socket; u_char Function; u_int state; - event_t EventMask; - int (*event_handler) (event_t event, int priority, - event_callback_args_t *); - event_callback_args_t event_callback_args; } client; /* information about this device */ Index: 2.6.10/sound/pcmcia/pdaudiocf/pdaudiocf.c =================================================================== --- 2.6.10.orig/sound/pcmcia/pdaudiocf/pdaudiocf.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/sound/pcmcia/pdaudiocf/pdaudiocf.c 2004-12-29 11:58:34.121308704 +0100 @@ -380,12 +380,13 @@ }; static struct pcmcia_driver pdacf_cs_driver = { - .owner = THIS_MODULE, - .drv = { - .name = "snd-pdaudiocf", + .owner = THIS_MODULE, + .drv = { + .name = "snd-pdaudiocf", }, - .attach = snd_pdacf_attach, - .detach = snd_pdacf_detach, + .attach = snd_pdacf_attach, + .event = pdacf_event, + .detach = snd_pdacf_detach, .id_table = snd_pdacf_ids, }; Index: 2.6.10/sound/pcmcia/vx/vx_entry.c =================================================================== --- 2.6.10.orig/sound/pcmcia/vx/vx_entry.c 2004-12-29 11:52:20.000000000 +0100 +++ 2.6.10/sound/pcmcia/vx/vx_entry.c 2004-12-29 11:58:34.150304625 +0100 @@ -35,7 +35,6 @@ * prototypes */ static void vxpocket_config(dev_link_t *link); -static int vxpocket_event(event_t event, int priority, event_callback_args_t *args); static void vxpocket_release(dev_link_t *link) @@ -157,14 +156,6 @@ /* Register with Card Services */ client_reg.dev_info = hw->dev_info; - client_reg.EventMask = - CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL -#ifdef CONFIG_PM - | CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET - | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME -#endif - ; - client_reg.event_handler = &vxpocket_event; client_reg.Version = 0x0210; client_reg.event_callback_args.client_data = link; @@ -298,7 +289,7 @@ /* * event callback */ -static int vxpocket_event(event_t event, int priority, event_callback_args_t *args) +int vxpocket_event(event_t event, int priority, event_callback_args_t *args) { dev_link_t *link = args->client_data; vx_core_t *chip = link->priv; @@ -357,4 +348,5 @@ */ EXPORT_SYMBOL(snd_vxpocket_ops); EXPORT_SYMBOL(snd_vxpocket_attach); +EXPORT_SYMBOL(vxpocket_event); EXPORT_SYMBOL(snd_vxpocket_detach);