Skip to content

Commit

Permalink
uwb: remove unused beacon group join/leave events
Browse files Browse the repository at this point in the history
The UWB_NOTIF_BG_JOIN/UWB_NOTIF_BG_LEAVE events have been
superceeded by the channel_changed callback in struct uwb_pal.

Signed-off-by: David Vrabel <david.vrabel@csr.com>
  • Loading branch information
David Vrabel committed Nov 19, 2008
1 parent e8e1594 commit 0996e63
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 20 deletions.
17 changes: 1 addition & 16 deletions drivers/uwb/beacon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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.
*/
Expand Down
7 changes: 3 additions & 4 deletions include/linux/uwb.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -568,16 +567,16 @@ 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
* maintains a list of all registered handlers and will notify all
* 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,
};
Expand Down

0 comments on commit 0996e63

Please sign in to comment.