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>
This commit is contained in:
@@ -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));
|
||||
|
||||
|
Reference in New Issue
Block a user