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>

diff --git a/drivers/uwb/beacon.c b/drivers/uwb/beacon.c
index b476187adf55e7bb6a5b67ca68a4658e738e2df5..f40745fcbd34ed6e9308ad763cc3970afd91cefe 100644 (file)
--- a/drivers/uwb/beacon.c
+++ b/drivers/uwb/beacon.c
@@ -397,7 +397,6 @@ int uwbd_evt_handle_rc_beacon(struct uwb_event *evt)
        struct uwb_rc_evt_beacon *be;
        struct uwb_beacon_frame *bf;
        struct uwb_beca_e *bce;
-       unsigned long last_ts;
 
        rc = evt->rc;
        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)
        /* purge old beacon data */
        kfree(bce->be);
 
-       last_ts = bce->ts_jiffies;
-
        /* Update commonly used fields */
        bce->ts_jiffies = evt->ts_jiffies;
        bce->be = be;

diff --git a/drivers/uwb/est.c b/drivers/uwb/est.c
index 457f31d99bf42d4cbd9240f6a6b450a298fdd1e2..f3e232584284a906309247e5ed5f3c0fef54e472 100644 (file)
--- 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,
 {
        unsigned long flags;
        unsigned itr;
-       u16 type_event_high;
        int result = 0;
 
        write_lock_irqsave(&uwb_est_lock, flags);
@@ -268,7 +267,6 @@ int uwb_est_register(u8 type, u8 event_high, u16 vendor, u16 product,
                        goto out;
        }
        /* Find the right spot to insert it in */
-       type_event_high = type << 8 | event_high;
        for (itr = 0; itr < uwb_est_used; itr++)
                if (uwb_est[itr].type_event_high < type
                    && uwb_est[itr].vendor < vendor

diff --git a/drivers/uwb/ie-rcv.c b/drivers/uwb/ie-rcv.c
index 917e6d78a798abe7362cb0aa2f79dd3494ec375f..5fac5744a6995391e8e49cec6e9e25d0f1eef330 100644 (file)
--- 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)
        int result = -EINVAL;
        struct device *dev = &evt->rc->uwb_dev.dev;
        struct uwb_rc_evt_ie_rcv *iercv;
-       size_t iesize;
 
        /* Is there enough data to decode it? */
        if (evt->notif.size < sizeof(*iercv)) {
@@ -41,7 +40,6 @@ int uwbd_evt_handle_rc_ie_rcv(struct uwb_event *evt)
                goto error;
        }
        iercv = container_of(evt->notif.rceb, struct uwb_rc_evt_ie_rcv, rceb);
-       iesize = le16_to_cpu(iercv->wIELength);
 
        dev_dbg(dev, "IE received, element ID=%d\n", iercv->IEData[0]);