From: Johan Hedberg <johan.hedberg@intel.com>
Date: Thu, 27 Mar 2014 11:51:24 +0000 (+0200)
Subject: Bluetooth: Remove unnecessary NULL check in hci_inquiry_cache_update
X-Git-Tag: firefly_0821_release~176^2~3540^2~11^2~7^2~45^2~32
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8002d77ca9edbf81b81ab5154d75f7cce3d0511e;p=firefly-linux-kernel-4.4.55.git

Bluetooth: Remove unnecessary NULL check in hci_inquiry_cache_update

The ssp parameter is supposed to be a mandatory one and there are no
callers that would pass NULL to this function. Removing this unnecessary
NULL check also makes (false positive) static analyzer warnings go away.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index c6189d9b6c09..7cf511cb1171 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2032,7 +2032,7 @@ bool hci_inquiry_cache_update(struct hci_dev *hdev, struct inquiry_data *data,
 
 	ie = hci_inquiry_cache_lookup(hdev, &data->bdaddr);
 	if (ie) {
-		if (ie->data.ssp_mode && ssp)
+		if (ie->data.ssp_mode)
 			*ssp = true;
 
 		if (ie->name_state == NAME_NEEDED &&