michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Refactor bt_init

Browse source 
This makes function flow follow common error handling convention
err = foo()
if (err)
  return err

Change-Id: Ifa3f44e3857b50436212cd5ed240795b220f8a15
Signed-off-by: Szymon Janc <ext.szymon.janc@tieto.com>
This commit is contained in:
Szymon Janc 2016-04-21 15:15:54 +02:00 • committed by Johan Hedberg
commit cef3c59488
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
net/bluetooth/hci_core.c
View file

@ -3244,25 +3244,28 @@ static int bt_init(void)
}
err = hci_init();
if (err) {
return err;
}
#if defined(CONFIG_BLUETOOTH_CONN)
if (!err) {
err = bt_conn_init();
err = bt_conn_init();
if (err) {
return err;
}
#endif /* CONFIG_BLUETOOTH_CONN */
#if defined(CONFIG_BLUETOOTH_PRIVACY)
if (!err) {
err = irk_init();
err = irk_init();
if (err) {
return err;
}
#endif
if (!err) {
atomic_set_bit(bt_dev.flags, BT_DEV_READY);
bt_le_scan_update(false);
}
atomic_set_bit(bt_dev.flags, BT_DEV_READY);
bt_le_scan_update(false);
return err;
return 0;
}
static void hci_rx_fiber(bt_ready_cb_t ready_cb)