Update of /cvsroot/alsa/alsa-kernel/pcmcia/vx
In directory sc8-pr-cvs1:/tmp/cvs-serv30865
Modified Files:
vx_entry.c
Log Message:
remove timer and clean up for 2.6 kernel.
Index: vx_entry.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pcmcia/vx/vx_entry.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vx_entry.c 10 Jun 2003 14:07:24 -0000 1.2
+++ vx_entry.c 24 Sep 2003 16:47:04 -0000 1.3
@@ -34,10 +34,8 @@
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) {
/* release cs resources */
CardServices(ReleaseConfiguration, link->handle);
@@ -56,7 +54,7 @@
struct snd_vxp_entry *hw;
dev_link_t *link = &vxp->link;
- vxpocket_release((u_long)link);
+ vxpocket_release(link);
/* Break the link with Card Services */
if (link->handle)
@@ -148,9 +146,6 @@
link->irq.Handler = &snd_vx_irq_handler;
link->irq.Instance = chip;
- link->release.function = &vxpocket_release;
- link->release.data = (u_long)link;
-
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.Vcc = 50;
link->conf.IntType = INT_MEMORY_AND_IO;
@@ -229,8 +224,6 @@
{
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");
/* Remove the interface data from the linked list */
if (hw) {
@@ -326,7 +319,6 @@
snd_printdd(KERN_DEBUG "CARD_REMOVAL..\n");
link->state &= ~DEV_PRESENT;
if (link->state & DEV_CONFIG) {
- mod_timer(&link->release, jiffies + HZ/20);
chip->chip_status |= VX_STAT_IS_STALE;
}
break;
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
