summaryrefslogtreecommitdiffstats
path: root/kernel/drivers/uwb
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/drivers/uwb')
-rw-r--r--kernel/drivers/uwb/drp.c4
-rw-r--r--kernel/drivers/uwb/neh.c4
-rw-r--r--kernel/drivers/uwb/rsv.c9
-rw-r--r--kernel/drivers/uwb/uwb-debug.c2
4 files changed, 6 insertions, 13 deletions
diff --git a/kernel/drivers/uwb/drp.c b/kernel/drivers/uwb/drp.c
index 8fc1b787d..38d0504a1 100644
--- a/kernel/drivers/uwb/drp.c
+++ b/kernel/drivers/uwb/drp.c
@@ -642,9 +642,7 @@ static void uwb_drp_handle_alien_drp(struct uwb_rc *rc, struct uwb_ie_drp *drp_i
}
INIT_LIST_HEAD(&cnflt->rc_node);
- init_timer(&cnflt->timer);
- cnflt->timer.function = uwb_cnflt_timer;
- cnflt->timer.data = (unsigned long)cnflt;
+ setup_timer(&cnflt->timer, uwb_cnflt_timer, (unsigned long)cnflt);
cnflt->rc = rc;
INIT_WORK(&cnflt->cnflt_update_work, uwb_cnflt_update_work);
diff --git a/kernel/drivers/uwb/neh.c b/kernel/drivers/uwb/neh.c
index 8cb71bb33..36b5cb62c 100644
--- a/kernel/drivers/uwb/neh.c
+++ b/kernel/drivers/uwb/neh.c
@@ -223,9 +223,7 @@ struct uwb_rc_neh *uwb_rc_neh_add(struct uwb_rc *rc, struct uwb_rccb *cmd,
kref_init(&neh->kref);
INIT_LIST_HEAD(&neh->list_node);
- init_timer(&neh->timer);
- neh->timer.function = uwb_rc_neh_timer;
- neh->timer.data = (unsigned long)neh;
+ setup_timer(&neh->timer, uwb_rc_neh_timer, (unsigned long)neh);
neh->rc = rc;
neh->evt_type = expected_type;
diff --git a/kernel/drivers/uwb/rsv.c b/kernel/drivers/uwb/rsv.c
index 536ad42b0..f5e27247a 100644
--- a/kernel/drivers/uwb/rsv.c
+++ b/kernel/drivers/uwb/rsv.c
@@ -470,9 +470,7 @@ static struct uwb_rsv *uwb_rsv_alloc(struct uwb_rc *rc)
INIT_LIST_HEAD(&rsv->rc_node);
INIT_LIST_HEAD(&rsv->pal_node);
kref_init(&rsv->kref);
- init_timer(&rsv->timer);
- rsv->timer.function = uwb_rsv_timer;
- rsv->timer.data = (unsigned long)rsv;
+ setup_timer(&rsv->timer, uwb_rsv_timer, (unsigned long)rsv);
rsv->rc = rc;
INIT_WORK(&rsv->handle_timeout_work, uwb_rsv_handle_timeout_work);
@@ -989,9 +987,8 @@ void uwb_rsv_init(struct uwb_rc *rc)
rc->bow.can_reserve_extra_mases = true;
rc->bow.total_expired = 0;
rc->bow.window = UWB_DRP_BACKOFF_WIN_MIN >> 1;
- init_timer(&rc->bow.timer);
- rc->bow.timer.function = uwb_rsv_backoff_win_timer;
- rc->bow.timer.data = (unsigned long)&rc->bow;
+ setup_timer(&rc->bow.timer, uwb_rsv_backoff_win_timer,
+ (unsigned long)&rc->bow);
bitmap_complement(rc->uwb_dev.streams, rc->uwb_dev.streams, UWB_NUM_STREAMS);
}
diff --git a/kernel/drivers/uwb/uwb-debug.c b/kernel/drivers/uwb/uwb-debug.c
index 0b1e5a944..991374b13 100644
--- a/kernel/drivers/uwb/uwb-debug.c
+++ b/kernel/drivers/uwb/uwb-debug.c
@@ -55,7 +55,7 @@
struct uwb_dbg {
struct uwb_pal pal;
- u32 accept;
+ bool accept;
struct list_head rsvs;
struct dentry *root_d;