diff options
| author |   Kees Cook <keescook@chromium.org> | 2017-10-04 17:54:29 -0700 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2017-10-06 20:37:11 +0200 |
| commit | 0435605289298a7311f78d02eb6a015cae7dbaf7 (patch) | |
| tree | 7c0ef1f26a29d7ff9235e0b3d76876061c661cae /drivers/bluetooth/bluecard_cs.c | |
| parent | Bluetooth: hci_bcm: Add (runtime)pm support to the serdev driver (diff) | |
| download | linux-dev-0435605289298a7311f78d02eb6a015cae7dbaf7.tar.xz linux-dev-0435605289298a7311f78d02eb6a015cae7dbaf7.zip | |
Bluetooth: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly. As already done in hci_qca, add
struct hci_uart pointer to priv structure.
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth/bluecard_cs.c')
| -rw-r--r-- | drivers/bluetooth/bluecard_cs.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c index b07ca9565291..d513ef4743dc 100644 --- a/drivers/bluetooth/bluecard_cs.c +++ b/drivers/bluetooth/bluecard_cs.c @@ -156,9 +156,9 @@ static void bluecard_detach(struct pcmcia_device *p_dev); /* ======================== LED handling routines ======================== */ -static void bluecard_activity_led_timeout(u_long arg) +static void bluecard_activity_led_timeout(struct timer_list *t) { - struct bluecard_info *info = (struct bluecard_info *)arg; + struct bluecard_info *info = from_timer(info, t, timer); unsigned int iobase = info->p_dev->resource[0]->start; if (test_bit(CARD_ACTIVITY, &(info->hw_state))) { @@ -691,8 +691,7 @@ static int bluecard_open(struct bluecard_info *info) spin_lock_init(&(info->lock)); - setup_timer(&(info->timer), &bluecard_activity_led_timeout, - (u_long)info); + timer_setup(&info->timer, bluecard_activity_led_timeout, 0); skb_queue_head_init(&(info->txq)); |