]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
isdn/capi: Use setup_timer
authorVaishali Thakkar <vthakkar1994@gmail.com>
Mon, 1 Jun 2015 01:40:15 +0000 (07:10 +0530)
committerDavid S. Miller <davem@davemloft.net>
Mon, 1 Jun 2015 04:36:37 +0000 (21:36 -0700)
Use the timer API function setup_timer instead of structure field
assignments to initialize a timer.

A simplified version of the Coccinelle semantic patch that performs
this transformation is as follows:

@change@
expression e1, e2, e3, e4, a, b;
@@

-init_timer(&e1);
+setup_timer(&e1, a, b);

... when != a = e2
    when != b = e3

-e1.data = b;
... when != a = e4
-e1.function = a;

Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/isdn/capi/capidrv.c

index 1cc6ca8bfbda3fa1268407677e7abd24d8977b01..85cfa4f8691f59e4a674f41377de91e300593b7d 100644 (file)
@@ -2264,7 +2264,7 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp)
                return -1;
        }
        card->owner = THIS_MODULE;
-       init_timer(&card->listentimer);
+       setup_timer(&card->listentimer, listentimerfunc, (unsigned long)card);
        strcpy(card->name, id);
        card->contrnr = contr;
        card->nbchan = profp->nbchannel;
@@ -2331,8 +2331,6 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp)
        card->cipmask = 0x1FFF03FF;     /* any */
        card->cipmask2 = 0;
 
-       card->listentimer.data = (unsigned long)card;
-       card->listentimer.function = listentimerfunc;
        send_listen(card);
        mod_timer(&card->listentimer, jiffies + 60 * HZ);