3 files changed, 8 insertions, 15 deletions

diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index 211c93fda6fc..e91b43a014b0 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -946,8 +946,7 @@ release_io:
 
 return_with_timer:
         DEBUGP(7, dev, "<- monitor_card (returns with timer)\n");
-        dev->timer.expires = jiffies + dev->mdelay;
-        add_timer(&dev->timer);
+        mod_timer(&dev->timer, jiffies + dev->mdelay);
         clear_bit(LOCK_MONITOR, &dev->flags);
 }
 
@@ -1406,12 +1405,9 @@ static void start_monitor(struct cm4000_dev *dev)
         DEBUGP(3, dev, "-> start_monitor\n");
         if (!dev->monitor_running) {
                 DEBUGP(5, dev, "create, init and add timer\n");
-                init_timer(&dev->timer);
+                setup_timer(&dev->timer, monitor_card, (unsigned long)dev);
                 dev->monitor_running = 1;
-                dev->timer.expires = jiffies;
-                dev->timer.data = (unsigned long) dev;
-                dev->timer.function = monitor_card;
-                add_timer(&dev->timer);
+                mod_timer(&dev->timer, jiffies);
         } else
                 DEBUGP(5, dev, "monitor already running\n");
         DEBUGP(3, dev, "<- start_monitor\n");
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index 9b1ff7e8f896..0e82968c2f38 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -632,8 +632,7 @@ static int reader_probe(struct pcmcia_device *link)
         init_waitqueue_head(&dev->poll_wait);
         init_waitqueue_head(&dev->read_wait);
         init_waitqueue_head(&dev->write_wait);
-        init_timer(&dev->poll_timer);
-        dev->poll_timer.function = &cm4040_do_poll;
+        setup_timer(&dev->poll_timer, cm4040_do_poll, 0);
 
         ret = reader_config(link, i);
         if (ret)
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 4ab2c98f978c..8d025e9b5bce 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -1361,9 +1361,7 @@ static int startup(MGSLPC_INFO * info)
         
         memset(&info->icount, 0, sizeof(info->icount));
 
-        init_timer(&info->tx_timer);
-        info->tx_timer.data = (unsigned long)info;
-        info->tx_timer.function = tx_timeout;
+        setup_timer(&info->tx_timer, tx_timeout, (unsigned long)info);
 
         /* Allocate and claim adapter resources */
         retval = claim_resources(info);
@@ -1408,7 +1406,7 @@ static void shutdown(MGSLPC_INFO * info)
         wake_up_interruptible(&info->status_event_wait_q);
         wake_up_interruptible(&info->event_wait_q);
 
-        del_timer(&info->tx_timer);     
+        del_timer_sync(&info->tx_timer);
 
         if (info->tx_buf) {
                 free_page((unsigned long) info->tx_buf);
@@ -3549,8 +3547,8 @@ static void tx_start(MGSLPC_INFO *info)
                 } else {
                         info->tx_active = 1;
                         tx_ready(info);
-                        info->tx_timer.expires = jiffies + msecs_to_jiffies(5000);
-                        add_timer(&info->tx_timer);     
+                        mod_timer(&info->tx_timer, jiffies +
+                                        msecs_to_jiffies(5000));
                 }
         }