[SCSI] qla2xxx: Correctly set FCF_TAPE_PRESENT flag based on scsi-device.

[safe/jmp/linux-2.6] / drivers / uwb / beacon.c

diff --git a/drivers/uwb/beacon.c b/drivers/uwb/beacon.c
index 2479560..36bc315 100644 (file)
--- a/drivers/uwb/beacon.c
+++ b/drivers/uwb/beacon.c
@@ -22,19 +22,16 @@
  *
  * FIXME: docs
  */
-
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/kdev_t.h>
-#include "uwb-internal.h"
 
-#define D_LOCAL 0
-#include <linux/uwb/debug.h>
+#include "uwb-internal.h"
 
-/** Start Beaconing command structure */
+/* Start Beaconing command structure */
 struct uwb_rc_cmd_start_beacon {
        struct uwb_rccb rccb;
        __le16 wBPSTOffset;
@@ -140,10 +137,8 @@ int uwb_rc_beacon(struct uwb_rc *rc, int channel, unsigned bpst_offset)
                }
        }
 
-       if (result >= 0) {
+       if (result >= 0)
                rc->beaconing = channel;
-               uwb_notify(rc, NULL, uwb_bg_joined(rc) ? UWB_NOTIF_BG_JOIN : UWB_NOTIF_BG_LEAVE);
-       }
        return result;
 }
 
@@ -178,9 +173,6 @@ struct uwb_beca_e *__uwb_beca_find_bydev(struct uwb_rc *rc,
 {
        struct uwb_beca_e *bce, *next;
        list_for_each_entry_safe(bce, next, &rc->uwb_beca.list, node) {
-               d_printf(6, NULL, "looking for addr %02x:%02x in %02x:%02x\n",
-                        dev_addr->data[0], dev_addr->data[1],
-                        bce->dev_addr.data[0], bce->dev_addr.data[1]);
                if (!memcmp(&bce->dev_addr, dev_addr, sizeof(bce->dev_addr)))
                        goto out;
        }
@@ -297,8 +289,6 @@ void uwb_beca_purge(struct uwb_rc *rc)
                expires = bce->ts_jiffies + msecs_to_jiffies(beacon_timeout_ms);
                if (time_after(jiffies, expires)) {
                        uwbd_dev_offair(bce);
-                       list_del(&bce->node);
-                       uwb_bce_put(bce);
                }
        }
        mutex_unlock(&rc->uwb_beca.mutex);
@@ -581,19 +571,6 @@ error:
        return result;
 }
 
-/**
- * uwb_bg_joined - is the RC in a beacon group?
- * @rc: the radio controller
- *
- * Returns true if the radio controller is in a beacon group (even if
- * it's the sole member).
- */
-int uwb_bg_joined(struct uwb_rc *rc)
-{
-       return rc->beaconing != -1;
-}
-EXPORT_SYMBOL_GPL(uwb_bg_joined);
-
 /*
  * Print beaconing state.
  */