pcmcia: Use setup_timer and mod_timer

This patch introduces the use of functions setup_timer
and mod_timer.

This is done using Coccinelle and semantic patch used
for this as follows:

// <smpl>
@@
expression x,y,z,a,b;
@@

-init_timer (&x);
+setup_timer (&x, y, z);
+mod_timer (&a, b);
-x.function = y;
-x.data = z;
-x.expires = b;
-add_timer(&a);

// </smpl>

Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c
index 34ace4854dc242513730582b5a51bbcdaf730cce..0f70b4d58f9e7c2d8bb2b9b6c0dc00d2dca3f308 100644 (file)
--- a/drivers/pcmcia/pd6729.c
+++ b/drivers/pcmcia/pd6729.c
@@ -707,11 +707,9 @@ static int pd6729_pci_probe(struct pci_dev *dev,
                }
        } else {
                /* poll Card status change */
-               init_timer(&socket->poll_timer);
-               socket->poll_timer.function = pd6729_interrupt_wrapper;
-               socket->poll_timer.data = (unsigned long)socket;
-               socket->poll_timer.expires = jiffies + HZ;
-               add_timer(&socket->poll_timer);
+               setup_timer(&socket->poll_timer, pd6729_interrupt_wrapper,
+                           (unsigned long)socket);
+               mod_timer(&socket->poll_timer, jiffies + HZ);
        }
 
        for (i = 0; i < MAX_SOCKETS; i++) {

diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 8a23ccb41213762317216a8cd10e7be0138638be..965bd84912335868ad92f995bcbe6b553b65da37 100644 (file)
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -1236,11 +1236,9 @@ static int yenta_probe(struct pci_dev *dev, const struct pci_device_id *id)
        if (!socket->cb_irq || request_irq(socket->cb_irq, yenta_interrupt, IRQF_SHARED, "yenta", socket)) {
                /* No IRQ or request_irq failed. Poll */
                socket->cb_irq = 0; /* But zero is a valid IRQ number. */
-               init_timer(&socket->poll_timer);
-               socket->poll_timer.function = yenta_interrupt_wrapper;
-               socket->poll_timer.data = (unsigned long)socket;
-               socket->poll_timer.expires = jiffies + HZ;
-               add_timer(&socket->poll_timer);
+               setup_timer(&socket->poll_timer, yenta_interrupt_wrapper,
+                           (unsigned long)socket);
+               mod_timer(&socket->poll_timer, jiffies + HZ);
                dev_printk(KERN_INFO, &dev->dev,
                           "no PCI IRQ, CardBus support disabled for this "
                           "socket.\n");