diff options
Diffstat (limited to 'sound/pcmcia/vx/vx_entry.c')
-rw-r--r-- | sound/pcmcia/vx/vx_entry.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sound/pcmcia/vx/vx_entry.c b/sound/pcmcia/vx/vx_entry.c index 332bbca3dfc4..df7a39ba9680 100644 --- a/sound/pcmcia/vx/vx_entry.c +++ b/sound/pcmcia/vx/vx_entry.c | |||
@@ -35,7 +35,6 @@ MODULE_LICENSE("GPL"); | |||
35 | * prototypes | 35 | * prototypes |
36 | */ | 36 | */ |
37 | static void vxpocket_config(dev_link_t *link); | 37 | static void vxpocket_config(dev_link_t *link); |
38 | static int vxpocket_event(event_t event, int priority, event_callback_args_t *args); | ||
39 | 38 | ||
40 | 39 | ||
41 | static void vxpocket_release(dev_link_t *link) | 40 | static void vxpocket_release(dev_link_t *link) |
@@ -169,14 +168,6 @@ dev_link_t *snd_vxpocket_attach(struct snd_vxp_entry *hw) | |||
169 | /* Register with Card Services */ | 168 | /* Register with Card Services */ |
170 | memset(&client_reg, 0, sizeof(client_reg)); | 169 | memset(&client_reg, 0, sizeof(client_reg)); |
171 | client_reg.dev_info = hw->dev_info; | 170 | client_reg.dev_info = hw->dev_info; |
172 | client_reg.EventMask = | ||
173 | CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | ||
174 | #ifdef CONFIG_PM | ||
175 | | CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET | ||
176 | | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME | ||
177 | #endif | ||
178 | ; | ||
179 | client_reg.event_handler = &vxpocket_event; | ||
180 | client_reg.Version = 0x0210; | 171 | client_reg.Version = 0x0210; |
181 | client_reg.event_callback_args.client_data = link; | 172 | client_reg.event_callback_args.client_data = link; |
182 | 173 | ||
@@ -321,7 +312,7 @@ failed: | |||
321 | /* | 312 | /* |
322 | * event callback | 313 | * event callback |
323 | */ | 314 | */ |
324 | static int vxpocket_event(event_t event, int priority, event_callback_args_t *args) | 315 | int vxpocket_event(event_t event, int priority, event_callback_args_t *args) |
325 | { | 316 | { |
326 | dev_link_t *link = args->client_data; | 317 | dev_link_t *link = args->client_data; |
327 | vx_core_t *chip = link->priv; | 318 | vx_core_t *chip = link->priv; |
@@ -380,4 +371,5 @@ static int vxpocket_event(event_t event, int priority, event_callback_args_t *ar | |||
380 | */ | 371 | */ |
381 | EXPORT_SYMBOL(snd_vxpocket_ops); | 372 | EXPORT_SYMBOL(snd_vxpocket_ops); |
382 | EXPORT_SYMBOL(snd_vxpocket_attach); | 373 | EXPORT_SYMBOL(snd_vxpocket_attach); |
374 | EXPORT_SYMBOL(vxpocket_event); | ||
383 | EXPORT_SYMBOL(snd_vxpocket_detach); | 375 | EXPORT_SYMBOL(snd_vxpocket_detach); |