aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorGeliang Tang <geliangtang@gmail.com>2017-03-11 08:46:58 +0800
committerMarcel Holtmann <marcel@holtmann.org>2017-04-12 22:02:37 +0200
commit459848564f5186bf033a5c1cc33c2cb3b284066e (patch)
tree84055bf8f9904593f0b49912bd2b35a5b5ade530 /drivers/bluetooth
parent6lowpan: Fix IID format for Bluetooth (diff)
downloadlinux-dev-459848564f5186bf033a5c1cc33c2cb3b284066e.tar.xz
linux-dev-459848564f5186bf033a5c1cc33c2cb3b284066e.zip
Bluetooth: bluecard: use setup_timer
Use setup_timer() instead of init_timer() to simplify the code. Signed-off-by: Geliang Tang <geliangtang@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/bluecard_cs.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index c0b3b5576992..007c0a45f31b 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -695,9 +695,8 @@ static int bluecard_open(struct bluecard_info *info)
spin_lock_init(&(info->lock));
- init_timer(&(info->timer));
- info->timer.function = &bluecard_activity_led_timeout;
- info->timer.data = (u_long)info;
+ setup_timer(&(info->timer), &bluecard_activity_led_timeout,
+ (u_long)info);
skb_queue_head_init(&(info->txq));