[PATCH] Bluetooth: Remove unnecessary params variable from process_adv_report()

Subsystems: bluetooth subsystem, the rest

STALE4440d

2 messages, 2 authors, 2014-07-15 · open the first message on its own page

[PATCH] Bluetooth: Remove unnecessary params variable from process_adv_report()

From: <hidden>
Date: 2014-07-15 05:07:59

From: Johan Hedberg <redacted>

The params variable was just used for storing the return value from the
hci_pend_le_action_lookup() function and then checking whether it's NULL
or not. We can simplify the code by checking the return value directly.

Signed-off-by: Johan Hedberg <redacted>
---
 net/bluetooth/hci_event.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 8980bd24b8c0..bf2926b2e4a9 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4314,14 +4314,11 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,
 	 * device found events.
 	 */
 	if (hdev->le_scan_type == LE_SCAN_PASSIVE) {
-		struct hci_conn_params *param;
-
 		if (type == LE_ADV_DIRECT_IND)
 			return;
 
-		param = hci_pend_le_action_lookup(&hdev->pend_le_reports,
-						  bdaddr, bdaddr_type);
-		if (!param)
+		if (!hci_pend_le_action_lookup(&hdev->pend_le_reports,
+					       bdaddr, bdaddr_type))
 			return;
 
 		if (type == LE_ADV_NONCONN_IND || type == LE_ADV_SCAN_IND)
-- 
1.9.3

Re: [PATCH] Bluetooth: Remove unnecessary params variable from process_adv_report()

From: Marcel Holtmann <marcel@holtmann.org>
Date: 2014-07-15 09:01:33

Hi Johan,
The params variable was just used for storing the return value from the
hci_pend_le_action_lookup() function and then checking whether it's NULL
or not. We can simplify the code by checking the return value directly.

Signed-off-by: Johan Hedberg <redacted>
---
net/bluetooth/hci_event.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
patch has been applied to bluetooth-next tree.

Regards

Marcel
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help