aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Pugliese <thomas.pugliese@gmail.com>2013-12-20 12:54:08 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-20 15:19:13 -0500
commit67d0fb2592acdd7cc41129279de2e520d53d68f0 (patch)
tree8713ec03cada288a7f3d77d27a0b58350000cde1
parentf79833a7ab44fd7ce4db47c65c929747463a452d (diff)
uwb: whitespace and comment cleanups
various whitespace and comment cleanups Signed-off-by: Thomas Pugliese <thomas.pugliese@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/uwb/beacon.c2
-rw-r--r--drivers/uwb/radio.c2
-rw-r--r--drivers/uwb/rsv.c14
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/uwb/beacon.c b/drivers/uwb/beacon.c
index 7b763610ce75..4190f29fe312 100644
--- a/drivers/uwb/beacon.c
+++ b/drivers/uwb/beacon.c
@@ -185,7 +185,7 @@ out:
185 185
186/* Find a beacon by dev addr in the cache */ 186/* Find a beacon by dev addr in the cache */
187static 187static
188struct uwb_beca_e *__uwb_beca_find_bymac(struct uwb_rc *rc, 188struct uwb_beca_e *__uwb_beca_find_bymac(struct uwb_rc *rc,
189 const struct uwb_mac_addr *mac_addr) 189 const struct uwb_mac_addr *mac_addr)
190{ 190{
191 struct uwb_beca_e *bce, *next; 191 struct uwb_beca_e *bce, *next;
diff --git a/drivers/uwb/radio.c b/drivers/uwb/radio.c
index 10adb9800999..fd23d985ea71 100644
--- a/drivers/uwb/radio.c
+++ b/drivers/uwb/radio.c
@@ -93,7 +93,7 @@ static int uwb_radio_change_channel(struct uwb_rc *rc, int channel)
93 * uwb_radio_start - request that the radio be started 93 * uwb_radio_start - request that the radio be started
94 * @pal: the PAL making the request. 94 * @pal: the PAL making the request.
95 * 95 *
96 * If the radio is not already active, aa suitable channel is selected 96 * If the radio is not already active, a suitable channel is selected
97 * and beacons are started. 97 * and beacons are started.
98 */ 98 */
99int uwb_radio_start(struct uwb_pal *pal) 99int uwb_radio_start(struct uwb_pal *pal)
diff --git a/drivers/uwb/rsv.c b/drivers/uwb/rsv.c
index 738e8a8cb811..4e7e4bf7542e 100644
--- a/drivers/uwb/rsv.c
+++ b/drivers/uwb/rsv.c
@@ -237,7 +237,7 @@ void uwb_rsv_backoff_win_increment(struct uwb_rc *rc)
237 /* reset the timer associated variables */ 237 /* reset the timer associated variables */
238 timeout_us = bow->n * UWB_SUPERFRAME_LENGTH_US; 238 timeout_us = bow->n * UWB_SUPERFRAME_LENGTH_US;
239 bow->total_expired = 0; 239 bow->total_expired = 0;
240 mod_timer(&bow->timer, jiffies + usecs_to_jiffies(timeout_us)); 240 mod_timer(&bow->timer, jiffies + usecs_to_jiffies(timeout_us));
241} 241}
242 242
243static void uwb_rsv_stroke_timer(struct uwb_rsv *rsv) 243static void uwb_rsv_stroke_timer(struct uwb_rsv *rsv)
@@ -257,7 +257,7 @@ static void uwb_rsv_stroke_timer(struct uwb_rsv *rsv)
257 sframes = 1; 257 sframes = 1;
258 if (rsv->state == UWB_RSV_STATE_O_ESTABLISHED) 258 if (rsv->state == UWB_RSV_STATE_O_ESTABLISHED)
259 sframes = 0; 259 sframes = 0;
260 260
261 } 261 }
262 262
263 if (sframes > 0) { 263 if (sframes > 0) {
@@ -611,7 +611,7 @@ int uwb_rsv_try_move(struct uwb_rsv *rsv, struct uwb_mas_bm *available)
611 struct device *dev = &rc->uwb_dev.dev; 611 struct device *dev = &rc->uwb_dev.dev;
612 struct uwb_rsv_move *mv; 612 struct uwb_rsv_move *mv;
613 int ret = 0; 613 int ret = 0;
614 614
615 if (bow->can_reserve_extra_mases == false) 615 if (bow->can_reserve_extra_mases == false)
616 return -EBUSY; 616 return -EBUSY;
617 617
@@ -628,7 +628,7 @@ int uwb_rsv_try_move(struct uwb_rsv *rsv, struct uwb_mas_bm *available)
628 } else { 628 } else {
629 dev_dbg(dev, "new allocation not found\n"); 629 dev_dbg(dev, "new allocation not found\n");
630 } 630 }
631 631
632 return ret; 632 return ret;
633} 633}
634 634
@@ -640,7 +640,7 @@ void uwb_rsv_handle_drp_avail_change(struct uwb_rc *rc)
640 struct uwb_drp_backoff_win *bow = &rc->bow; 640 struct uwb_drp_backoff_win *bow = &rc->bow;
641 struct uwb_rsv *rsv; 641 struct uwb_rsv *rsv;
642 struct uwb_mas_bm mas; 642 struct uwb_mas_bm mas;
643 643
644 if (bow->can_reserve_extra_mases == false) 644 if (bow->can_reserve_extra_mases == false)
645 return; 645 return;
646 646
@@ -652,7 +652,7 @@ void uwb_rsv_handle_drp_avail_change(struct uwb_rc *rc)
652 uwb_rsv_try_move(rsv, &mas); 652 uwb_rsv_try_move(rsv, &mas);
653 } 653 }
654 } 654 }
655 655
656} 656}
657 657
658/** 658/**
@@ -916,7 +916,7 @@ static void uwb_rsv_alien_bp_work(struct work_struct *work)
916 struct uwb_rsv *rsv; 916 struct uwb_rsv *rsv;
917 917
918 mutex_lock(&rc->rsvs_mutex); 918 mutex_lock(&rc->rsvs_mutex);
919 919
920 list_for_each_entry(rsv, &rc->reservations, rc_node) { 920 list_for_each_entry(rsv, &rc->reservations, rc_node) {
921 if (rsv->type != UWB_DRP_TYPE_ALIEN_BP) { 921 if (rsv->type != UWB_DRP_TYPE_ALIEN_BP) {
922 rsv->callback(rsv); 922 rsv->callback(rsv);