Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-27 06:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

uwb: remove unused beacon group join/leave events

Browse Source 
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>
This commit is contained in:
David Vrabel 2008-11-17 16:23:22 +00:00
parent e8e1594c81
commit 0996e63824
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/uwb/beacon.c
View File

@ -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; rc->beaconing = channel;
uwb_notify(rc, NULL, uwb_bg_joined(rc) ? UWB_NOTIF_BG_JOIN : UWB_NOTIF_BG_LEAVE);
}
return result; return result;
} }
@ -581,19 +579,6 @@ error:
return result; 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. * Print beaconing state.
*/ */

7
include/linux/uwb.h
View File

@ -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, struct uwb_rccb *cmd, size_t cmd_size,
u8 expected_type, u16 expected_event, u8 expected_type, u16 expected_event,
struct uwb_rceb **preply); struct uwb_rceb **preply);
int uwb_bg_joined(struct uwb_rc *rc);
size_t __uwb_addr_print(char *, size_t, const unsigned char *, int); 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 * Higher layers can register callback functions with the radio
* controller using uwb_notifs_register(). The radio controller * 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. * nodes when an event occurs.
*/ */
enum uwb_notifs { 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_ONAIR,
UWB_NOTIF_OFFAIR, UWB_NOTIF_OFFAIR,
}; };