openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Allen Pais 2017-09-25 13:00:05 +05:30 committed by David S. Miller
parent 22d387e13a
commit d835b63cc4
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/nfc/llcp_core.c
View File

@ -1573,9 +1573,8 @@ int nfc_llcp_register_device(struct nfc_dev *ndev)
INIT_LIST_HEAD(&local->list); INIT_LIST_HEAD(&local->list);
kref_init(&local->ref); kref_init(&local->ref);
mutex_init(&local->sdp_lock); mutex_init(&local->sdp_lock);
init_timer(&local->link_timer); setup_timer(&local->link_timer, nfc_llcp_symm_timer,
local->link_timer.data = (unsigned long) local; (unsigned long)local);
local->link_timer.function = nfc_llcp_symm_timer;
skb_queue_head_init(&local->tx_queue); skb_queue_head_init(&local->tx_queue);
INIT_WORK(&local->tx_work, nfc_llcp_tx_work); 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); mutex_init(&local->sdreq_lock);
INIT_HLIST_HEAD(&local->pending_sdreqs); INIT_HLIST_HEAD(&local->pending_sdreqs);
init_timer(&local->sdreq_timer); setup_timer(&local->sdreq_timer, nfc_llcp_sdreq_timer,
local->sdreq_timer.data = (unsigned long) local; (unsigned long)local);
local->sdreq_timer.function = nfc_llcp_sdreq_timer;
INIT_WORK(&local->sdreq_timeout_work, nfc_llcp_sdreq_timeout_work); INIT_WORK(&local->sdreq_timeout_work, nfc_llcp_sdreq_timeout_work);
list_add(&local->list, &llcp_devices); list_add(&local->list, &llcp_devices);