diff options
| author | Allen Pais <allen.lkml@gmail.com> | 2017-09-25 13:00:05 +0530 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-25 13:19:20 -0700 |
| commit | d835b63cc4ee67e59eed9d1957f729c0a30b7331 (patch) | |
| tree | 855c10ac1e6d58ee5781a4b98d226699fd25d024 /net | |
| parent | 22d387e13ac357279ddac55694883fd3e30a5639 (diff) | |
| download | linux-d835b63cc4ee67e59eed9d1957f729c0a30b7331.tar.gz linux-d835b63cc4ee67e59eed9d1957f729c0a30b7331.tar.bz2 linux-d835b63cc4ee67e59eed9d1957f729c0a30b7331.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/nfc/llcp_core.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/nfc/llcp_core.c b/net/nfc/llcp_core.c index 02eef5cf3cce..7988185072e5 100644 --- 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); |