net: nfc: llcp_core: use setup_timer() helper.

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

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/nfc/llcp_core.c b/net/nfc/llcp_core.c
index 02eef5cf3cce0a177bd0a302575004015933a25b..7988185072e5f308528b9a7b1093d6e419428ec8 100644 (file)
--- a/net/nfc/llcp_core.c
+++ b/net/nfc/llcp_core.c
@@ -1573,9 +1573,8 @@ int nfc_llcp_register_device(struct nfc_dev *ndev)
        INIT_LIST_HEAD(&local->list);
        kref_init(&local->ref);
        mutex_init(&local->sdp_lock);
-       init_timer(&local->link_timer);
-       local->link_timer.data = (unsigned long) local;
-       local->link_timer.function = nfc_llcp_symm_timer;
+       setup_timer(&local->link_timer, nfc_llcp_symm_timer,
+                   (unsigned long)local);
 
        skb_queue_head_init(&local->tx_queue);
        INIT_WORK(&local->tx_work, nfc_llcp_tx_work);
@@ -1601,9 +1600,8 @@ int nfc_llcp_register_device(struct nfc_dev *ndev)
 
        mutex_init(&local->sdreq_lock);
        INIT_HLIST_HEAD(&local->pending_sdreqs);
-       init_timer(&local->sdreq_timer);
-       local->sdreq_timer.data = (unsigned long) local;
-       local->sdreq_timer.function = nfc_llcp_sdreq_timer;
+       setup_timer(&local->sdreq_timer, nfc_llcp_sdreq_timer,
+                   (unsigned long)local);
        INIT_WORK(&local->sdreq_timeout_work, nfc_llcp_sdreq_timeout_work);
 
        list_add(&local->list, &llcp_devices);