diff options
| author | Thomas Pugliese <thomas.pugliese@gmail.com> | 2014-04-28 15:53:27 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-27 18:18:48 -0400 |
| commit | c6a64de08e52235b570fedbe927cc5f3127ca47e (patch) | |
| tree | 8d59c9acf7f64054d9766587dd86dbd5885a25b0 | |
| parent | 992801645bd9458d9317a552e194bf27f4d53151 (diff) | |
uwb: fix variable set but not used warnings
Fix variable set but not used warnings in UWB.
Signed-off-by: Thomas Pugliese <thomas.pugliese@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/uwb/beacon.c | 3 | ||||
| -rw-r--r-- | drivers/uwb/est.c | 2 | ||||
| -rw-r--r-- | drivers/uwb/ie-rcv.c | 2 |
3 files changed, 0 insertions, 7 deletions
diff --git a/drivers/uwb/beacon.c b/drivers/uwb/beacon.c index b476187adf55..f40745fcbd34 100644 --- a/drivers/uwb/beacon.c +++ b/drivers/uwb/beacon.c | |||
| @@ -397,7 +397,6 @@ int uwbd_evt_handle_rc_beacon(struct uwb_event *evt) | |||
| 397 | struct uwb_rc_evt_beacon *be; | 397 | struct uwb_rc_evt_beacon *be; |
| 398 | struct uwb_beacon_frame *bf; | 398 | struct uwb_beacon_frame *bf; |
| 399 | struct uwb_beca_e *bce; | 399 | struct uwb_beca_e *bce; |
| 400 | unsigned long last_ts; | ||
| 401 | 400 | ||
| 402 | rc = evt->rc; | 401 | rc = evt->rc; |
| 403 | be = container_of(evt->notif.rceb, struct uwb_rc_evt_beacon, rceb); | 402 | be = container_of(evt->notif.rceb, struct uwb_rc_evt_beacon, rceb); |
| @@ -441,8 +440,6 @@ int uwbd_evt_handle_rc_beacon(struct uwb_event *evt) | |||
| 441 | /* purge old beacon data */ | 440 | /* purge old beacon data */ |
| 442 | kfree(bce->be); | 441 | kfree(bce->be); |
| 443 | 442 | ||
| 444 | last_ts = bce->ts_jiffies; | ||
| 445 | |||
| 446 | /* Update commonly used fields */ | 443 | /* Update commonly used fields */ |
| 447 | bce->ts_jiffies = evt->ts_jiffies; | 444 | bce->ts_jiffies = evt->ts_jiffies; |
| 448 | bce->be = be; | 445 | bce->be = be; |
diff --git a/drivers/uwb/est.c b/drivers/uwb/est.c index 457f31d99bf4..f3e232584284 100644 --- a/drivers/uwb/est.c +++ b/drivers/uwb/est.c | |||
| @@ -258,7 +258,6 @@ int uwb_est_register(u8 type, u8 event_high, u16 vendor, u16 product, | |||
| 258 | { | 258 | { |
| 259 | unsigned long flags; | 259 | unsigned long flags; |
| 260 | unsigned itr; | 260 | unsigned itr; |
| 261 | u16 type_event_high; | ||
| 262 | int result = 0; | 261 | int result = 0; |
| 263 | 262 | ||
| 264 | write_lock_irqsave(&uwb_est_lock, flags); | 263 | write_lock_irqsave(&uwb_est_lock, flags); |
| @@ -268,7 +267,6 @@ int uwb_est_register(u8 type, u8 event_high, u16 vendor, u16 product, | |||
| 268 | goto out; | 267 | goto out; |
| 269 | } | 268 | } |
| 270 | /* Find the right spot to insert it in */ | 269 | /* Find the right spot to insert it in */ |
| 271 | type_event_high = type << 8 | event_high; | ||
| 272 | for (itr = 0; itr < uwb_est_used; itr++) | 270 | for (itr = 0; itr < uwb_est_used; itr++) |
| 273 | if (uwb_est[itr].type_event_high < type | 271 | if (uwb_est[itr].type_event_high < type |
| 274 | && uwb_est[itr].vendor < vendor | 272 | && uwb_est[itr].vendor < vendor |
diff --git a/drivers/uwb/ie-rcv.c b/drivers/uwb/ie-rcv.c index 917e6d78a798..5fac5744a699 100644 --- a/drivers/uwb/ie-rcv.c +++ b/drivers/uwb/ie-rcv.c | |||
| @@ -31,7 +31,6 @@ int uwbd_evt_handle_rc_ie_rcv(struct uwb_event *evt) | |||
| 31 | int result = -EINVAL; | 31 | int result = -EINVAL; |
| 32 | struct device *dev = &evt->rc->uwb_dev.dev; | 32 | struct device *dev = &evt->rc->uwb_dev.dev; |
| 33 | struct uwb_rc_evt_ie_rcv *iercv; | 33 | struct uwb_rc_evt_ie_rcv *iercv; |
| 34 | size_t iesize; | ||
| 35 | 34 | ||
| 36 | /* Is there enough data to decode it? */ | 35 | /* Is there enough data to decode it? */ |
| 37 | if (evt->notif.size < sizeof(*iercv)) { | 36 | if (evt->notif.size < sizeof(*iercv)) { |
| @@ -41,7 +40,6 @@ int uwbd_evt_handle_rc_ie_rcv(struct uwb_event *evt) | |||
| 41 | goto error; | 40 | goto error; |
| 42 | } | 41 | } |
| 43 | iercv = container_of(evt->notif.rceb, struct uwb_rc_evt_ie_rcv, rceb); | 42 | iercv = container_of(evt->notif.rceb, struct uwb_rc_evt_ie_rcv, rceb); |
| 44 | iesize = le16_to_cpu(iercv->wIELength); | ||
| 45 | 43 | ||
| 46 | dev_dbg(dev, "IE received, element ID=%d\n", iercv->IEData[0]); | 44 | dev_dbg(dev, "IE received, element ID=%d\n", iercv->IEData[0]); |
| 47 | 45 | ||
