Commit 6cf73674 authored by Vinay K. Nallamothu's avatar Vinay K. Nallamothu Committed by Linus Torvalds

[PATCH] vx_entry.c: remove release timer

sound/pcmcia/vx/vx_entry.c:

This patch removes the PCMCIA timer release functionality which is no
longer required. Without this the module does not compile.
parent 2bb72a77
...@@ -34,10 +34,8 @@ static void vxpocket_config(dev_link_t *link); ...@@ -34,10 +34,8 @@ static void vxpocket_config(dev_link_t *link);
static int vxpocket_event(event_t event, int priority, event_callback_args_t *args); static int vxpocket_event(event_t event, int priority, event_callback_args_t *args);
static void vxpocket_release(u_long arg) static void vxpocket_release(dev_link_t* link)
{ {
dev_link_t *link = (dev_link_t *)arg;
if (link->state & DEV_CONFIG) { if (link->state & DEV_CONFIG) {
/* release cs resources */ /* release cs resources */
CardServices(ReleaseConfiguration, link->handle); CardServices(ReleaseConfiguration, link->handle);
...@@ -56,7 +54,7 @@ static int snd_vxpocket_free(vx_core_t *chip) ...@@ -56,7 +54,7 @@ static int snd_vxpocket_free(vx_core_t *chip)
struct snd_vxp_entry *hw; struct snd_vxp_entry *hw;
dev_link_t *link = &vxp->link; dev_link_t *link = &vxp->link;
vxpocket_release((u_long)link); vxpocket_release(link);
/* Break the link with Card Services */ /* Break the link with Card Services */
if (link->handle) if (link->handle)
...@@ -148,9 +146,6 @@ dev_link_t *snd_vxpocket_attach(struct snd_vxp_entry *hw) ...@@ -148,9 +146,6 @@ dev_link_t *snd_vxpocket_attach(struct snd_vxp_entry *hw)
link->irq.Handler = &snd_vx_irq_handler; link->irq.Handler = &snd_vx_irq_handler;
link->irq.Instance = chip; link->irq.Instance = chip;
link->release.function = &vxpocket_release;
link->release.data = (u_long)link;
link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.Vcc = 50; link->conf.Vcc = 50;
link->conf.IntType = INT_MEMORY_AND_IO; link->conf.IntType = INT_MEMORY_AND_IO;
...@@ -229,8 +224,6 @@ void snd_vxpocket_detach(struct snd_vxp_entry *hw, dev_link_t *link) ...@@ -229,8 +224,6 @@ void snd_vxpocket_detach(struct snd_vxp_entry *hw, dev_link_t *link)
{ {
vx_core_t *chip = snd_magic_cast(vx_core_t, link->priv, return); vx_core_t *chip = snd_magic_cast(vx_core_t, link->priv, return);
del_timer(&link->release);
snd_printdd(KERN_DEBUG "vxpocket_detach called\n"); snd_printdd(KERN_DEBUG "vxpocket_detach called\n");
/* Remove the interface data from the linked list */ /* Remove the interface data from the linked list */
if (hw) { if (hw) {
...@@ -326,7 +319,6 @@ static int vxpocket_event(event_t event, int priority, event_callback_args_t *ar ...@@ -326,7 +319,6 @@ static int vxpocket_event(event_t event, int priority, event_callback_args_t *ar
snd_printdd(KERN_DEBUG "CARD_REMOVAL..\n"); snd_printdd(KERN_DEBUG "CARD_REMOVAL..\n");
link->state &= ~DEV_PRESENT; link->state &= ~DEV_PRESENT;
if (link->state & DEV_CONFIG) { if (link->state & DEV_CONFIG) {
mod_timer(&link->release, jiffies + HZ/20);
chip->chip_status |= VX_STAT_IS_STALE; chip->chip_status |= VX_STAT_IS_STALE;
} }
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment