Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a24c85ab authored by Vaishali Thakkar's avatar Vaishali Thakkar Committed by David S. Miller
Browse files

isdn/capi: Use setup_timer 



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: default avatarVaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 52e0b2b1

drivers/isdn/capi/capidrv.c

+1 −3
Original line number Diff line number Diff line
@@ -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);