[PATCH 1/1] net:nfc: use setup_timer

Subsystems: networking [general], nfc subsystem, the rest

STALE3270d

2 messages, 2 authors, 2017-09-21 · open the first message on its own page

[PATCH 1/1] net:nfc: use setup_timer

From: Allen Pais <hidden>
Date: 2017-09-21 10:59:43

    Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <redacted>
---
 net/nfc/core.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/nfc/core.c b/net/nfc/core.c
index 5cf33df..e5e23c2 100644
--- a/net/nfc/core.c
+++ b/net/nfc/core.c
@@ -1094,9 +1094,8 @@ struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops,
 	dev->targets_generation = 1;
 
 	if (ops->check_presence) {
-		init_timer(&dev->check_pres_timer);
-		dev->check_pres_timer.data = (unsigned long)dev;
-		dev->check_pres_timer.function = nfc_check_pres_timeout;
+		setup_timer(&dev->check_pres_timer, nfc_check_pres_timeout,
+			    (unsigned long)dev);
 
 		INIT_WORK(&dev->check_pres_work, nfc_check_pres_work);
 	}
-- 
2.7.4

Re: [PATCH 1/1] net:nfc: use setup_timer

From: David Miller <davem@davemloft.net>
Date: 2017-09-21 22:48:59

From: Allen Pais <redacted>
Date: Thu, 21 Sep 2017 16:29:33 +0530
    Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <redacted>
Applied.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help