浏览代码

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>
Allen Pais 8 年之前
父节点
当前提交
2ed343f981
共有 1 个文件被更改,包括 2 次插入3 次删除
  1. 2 3
      net/nfc/core.c

+ 2 - 3
net/nfc/core.c

@@ -1094,9 +1094,8 @@ struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops,
 	dev->targets_generation = 1;
 	dev->targets_generation = 1;
 
 
 	if (ops->check_presence) {
 	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);
 		INIT_WORK(&dev->check_pres_work, nfc_check_pres_work);
 	}
 	}