diff options
| author |   Allen Pais <allen.lkml@gmail.com> | 2017-09-21 16:29:33 +0530 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-09-21 15:47:57 -0700 |
| commit | 2ed343f98178ff232b504bbd006b34db07835082 (patch) | |
| tree | 901e93d27399b74ac2d69e45666869c763c72140 /net | |
| parent | bridge: trigger RTM_NEWLINK when interface is modified by bridge ioctl (diff) | |
| download | linux-dev-2ed343f98178ff232b504bbd006b34db07835082.tar.xz linux-dev-2ed343f98178ff232b504bbd006b34db07835082.zip | |
net:nfc: use setup_timer
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/core.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/nfc/core.c b/net/nfc/core.c index 5cf33df888c3..e5e23c2cbe74 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); } |