net: nfc: hci: 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/hci/core.c b/net/nfc/hci/core.c
index b740fef0acc5ef5b6f81c633da4693675d2be417..a8a6e7814e0918916553232a469db99735d6869c 100644 (file)
--- a/net/nfc/hci/core.c
+++ b/net/nfc/hci/core.c
@@ -1004,9 +1004,8 @@ int nfc_hci_register_device(struct nfc_hci_dev *hdev)
 
        INIT_WORK(&hdev->msg_tx_work, nfc_hci_msg_tx_work);
 
-       init_timer(&hdev->cmd_timer);
-       hdev->cmd_timer.data = (unsigned long)hdev;
-       hdev->cmd_timer.function = nfc_hci_cmd_timeout;
+       setup_timer(&hdev->cmd_timer, nfc_hci_cmd_timeout,
+                   (unsigned long)hdev);
 
        skb_queue_head_init(&hdev->rx_hcp_frags);