samples: bluetooth: Remove useless default_conn

rugeGerritsen · nashif · commit fc140d86161b · 2021-02-01T08:38:54.000-05:00
The connection object is not used.

Signed-off-by: Rubin Gerritsen &lt;rubin.gerritsen@nordicsemi.no&gt;
diff --git a/samples/bluetooth/peripheral_hr/src/main.c b/samples/bluetooth/peripheral_hr/src/main.c
@@ -22,8 +22,6 @@
 #include <bluetooth/services/bas.h>
 #include <bluetooth/services/hrs.h>
 
-struct bt_conn *default_conn;
-
 static const struct bt_data ad[] = {
 	BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
 	BT_DATA_BYTES(BT_DATA_UUID16_ALL,
@@ -37,19 +35,13 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	if (err) {
 		printk("Connection failed (err 0x%02x)\n", err);
 	} else {
-		default_conn = bt_conn_ref(conn);
 		printk("Connected\n");
 	}
 }
 
 static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	printk("Disconnected (reason 0x%02x)\n", reason);
-
-	if (default_conn) {
-		bt_conn_unref(default_conn);
-		default_conn = NULL;
-	}
 }
 
 static struct bt_conn_cb conn_callbacks = {
diff --git a/samples/bluetooth/peripheral_ht/src/main.c b/samples/bluetooth/peripheral_ht/src/main.c
@@ -23,8 +23,6 @@
 
 #include "hts.h"
 
-struct bt_conn *default_conn;
-
 static const struct bt_data ad[] = {
 	BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
 	BT_DATA_BYTES(BT_DATA_UUID16_ALL,
@@ -38,19 +36,13 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	if (err) {
 		printk("Connection failed (err 0x%02x)\n", err);
 	} else {
-		default_conn = bt_conn_ref(conn);
 		printk("Connected\n");
 	}
 }
 
 static void disconnected(struct bt_conn *conn, uint8_t reason)
 {
 	printk("Disconnected (reason 0x%02x)\n", reason);
-
-	if (default_conn) {
-		bt_conn_unref(default_conn);
-		default_conn = NULL;
-	}
 }
 
 static struct bt_conn_cb conn_callbacks = {

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@`
`23`	`23`
`24`	`24`	`#include "hts.h"`
`25`	`25`
`26`		`-struct bt_conn *default_conn;`
`27`		`-`
`28`	`26`	`static const struct bt_data ad[] = {`
`29`	`27`	`BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL \| BT_LE_AD_NO_BREDR)),`
`30`	`28`	`BT_DATA_BYTES(BT_DATA_UUID16_ALL,`
`@@ -38,19 +36,13 @@ static void connected(struct bt_conn *conn, uint8_t err)`
`38`	`36`	`if (err) {`
`39`	`37`	`printk("Connection failed (err 0x%02x)\n", err);`
`40`	`38`	`} else {`
`41`		`- default_conn = bt_conn_ref(conn);`
`42`	`39`	`printk("Connected\n");`
`43`	`40`	`}`
`44`	`41`	`}`
`45`	`42`
`46`	`43`	`static void disconnected(struct bt_conn *conn, uint8_t reason)`
`47`	`44`	`{`
`48`	`45`	`printk("Disconnected (reason 0x%02x)\n", reason);`
`49`		`-`
`50`		`- if (default_conn) {`
`51`		`- bt_conn_unref(default_conn);`
`52`		`- default_conn = NULL;`
`53`		`- }`
`54`	`46`	`}`
`55`	`47`
`56`	`48`	`static struct bt_conn_cb conn_callbacks = {`