diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2013-10-05 11:47:46 -0700 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2013-10-06 10:25:07 +0200 |
| commit | 346e7099c299eae085efd9b4aeda813d69bc364b (patch) | |
| tree | 2e52d79a53c506574c6faa4b74d61dc20188647f /net/bluetooth/a2mp.c | |
| parent | 536619e86d9398a20063f7c3d15deb9dcc234097 (diff) | |
| download | linux-stable-346e7099c299eae085efd9b4aeda813d69bc364b.tar.gz linux-stable-346e7099c299eae085efd9b4aeda813d69bc364b.tar.bz2 linux-stable-346e7099c299eae085efd9b4aeda813d69bc364b.zip | |
Bluetooth: Remove pointless inline function
The inline function for BR/EDR controller AMP discover response
info is rather useless. Just include the code into the function
that builds the whole response.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/a2mp.c')
| -rw-r--r-- | net/bluetooth/a2mp.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c index 6dfef731825f..a1aae5c45b7e 100644 --- a/net/bluetooth/a2mp.c +++ b/net/bluetooth/a2mp.c @@ -75,20 +75,15 @@ u8 __next_ident(struct amp_mgr *mgr) return mgr->ident; } -static inline void __a2mp_cl_bredr(struct a2mp_cl *cl) -{ - cl->id = AMP_ID_BREDR; - cl->type = AMP_TYPE_BREDR; - cl->status = AMP_STATUS_BLUETOOTH_ONLY; -} - /* hci_dev_list shall be locked */ static void __a2mp_add_cl(struct amp_mgr *mgr, struct a2mp_cl *cl, u8 num_ctrl) { int i = 0; struct hci_dev *hdev; - __a2mp_cl_bredr(cl); + cl[0].id = AMP_ID_BREDR; + cl[0].type = AMP_TYPE_BREDR; + cl[0].status = AMP_STATUS_BLUETOOTH_ONLY; list_for_each_entry(hdev, &hci_dev_list, list) { /* Iterate through AMP controllers */ |