From 63a28771a214b0b8ea765df8880d75ae13babc2e Mon Sep 17 00:00:00 2001
From: David Vrabel <david.vrabel@csr.com>
Date: Mon, 17 Nov 2008 16:23:22 +0000
Subject: [PATCH] --- yaml --- r: 125118 b: refs/heads/master c:
 0996e6382482ce9014787693d3884e9468153a5c h: refs/heads/master v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/uwb/beacon.c | 17 +----------------
 trunk/include/linux/uwb.h  |  7 +++----
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index b9c1c40942d1..84c18c2a571b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8e1594c8126b1b773988fa2e3bfec76cff88336
+refs/heads/master: 0996e6382482ce9014787693d3884e9468153a5c
diff --git a/trunk/drivers/uwb/beacon.c b/trunk/drivers/uwb/beacon.c
index 247956098afa..d9c60cb94993 100644
--- a/trunk/drivers/uwb/beacon.c
+++ b/trunk/drivers/uwb/beacon.c
@@ -140,10 +140,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;
 }
 
@@ -581,19 +579,6 @@ int uwbd_evt_handle_rc_bpoie_change(struct uwb_event *evt)
 	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.
  */
diff --git a/trunk/include/linux/uwb.h b/trunk/include/linux/uwb.h
index 7d3ebf046f9a..1719709d60ca 100644
--- a/trunk/include/linux/uwb.h
+++ b/trunk/include/linux/uwb.h
@@ -479,7 +479,6 @@ ssize_t uwb_rc_vcmd(struct uwb_rc *rc, const char *cmd_name,
 		    struct uwb_rccb *cmd, size_t cmd_size,
 		    u8 expected_type, u16 expected_event,
 		    struct uwb_rceb **preply);
-int uwb_bg_joined(struct uwb_rc *rc);
 
 size_t __uwb_addr_print(char *, size_t, const unsigned char *, int);
 
@@ -568,7 +567,9 @@ static inline bool uwb_rsv_is_owner(struct uwb_rsv *rsv)
 }
 
 /**
- * Events generated by UWB that can be passed to any listeners
+ * enum uwb_notifs - UWB events that can be passed to any listeners
+ * @UWB_NOTIF_ONAIR: a new neighbour has joined the beacon group.
+ * @UWB_NOTIF_OFFAIR: a neighbour has left the beacon group.
  *
  * Higher layers can register callback functions with the radio
  * controller using uwb_notifs_register(). The radio controller
@@ -576,8 +577,6 @@ static inline bool uwb_rsv_is_owner(struct uwb_rsv *rsv)
  * nodes when an event occurs.
  */
 enum uwb_notifs {
-	UWB_NOTIF_BG_JOIN = 0,	/* radio controller joined a beacon group */
-	UWB_NOTIF_BG_LEAVE = 1,	/* radio controller left a beacon group */
 	UWB_NOTIF_ONAIR,
 	UWB_NOTIF_OFFAIR,
 };