Skip to contentSkip to conversation

NFC: nci: Remove an unneeded NULL check

PATCH In review Dan Carpenter 2 participants 2 messages Jun 14, 2017 – Jun 22, 2017

Subsystems (3)
Networking Kernel janitors NFC
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 NFC: nci: Remove an unneeded NULL check

"conn_info" can't be NULL here. Also we just dereferenced it a couple lines earlier, so that makes static checkers complain.

Signed-off-by Dan Carpenter <[email protected]>
net/nfc/nci/core.c +3 -5
index 61fff422424f..5542fc72f020 100644
@@ -73,11 +73,9 @@ int nci_get_conn_info_by_dest_type_params(struct nci_dev *ndev, u8 dest_type,
 		if (conn_info->dest_type = dest_type) {
 			if (!params)
 				return conn_info->conn_id;
-			if (conn_info) {
-				if (params->id = conn_info->dest_params->id &&
-				    params->protocol = conn_info->dest_params->protocol)
-					return conn_info->conn_id;
-			}
+			if (params->id = conn_info->dest_params->id &&
+			    params->protocol = conn_info->dest_params->protocol)
+				return conn_info->conn_id;
 		}
 	}
#1 lore raw

Hi Dan,

Quoted 11 lines · Dan Carpenter

"conn_info" can't be NULL here. Also we just dereferenced it a couple lines earlier, so that makes static checkers complain.

Signed-off-by Dan Carpenter <[email protected]>
net/nfc/nci/core.c +0 -0
index 61fff422424f..5542fc72f020 100644
@@ -73,11 +73,9 @@ int nci_get_conn_info_by_dest_type_params(struct nci_dev *ndev, u8 dest_type,
 		if (conn_info->dest_type = dest_type) {

net/nfc/nci/core.c int nci_get_conn_info_by_dest_type_params(struct nci_dev *ndev, u8 dest_type, · line 78

Quoted 10 lines
net/nfc/nci/core.c +3 -5
 			if (!params)
 				return conn_info->conn_id;
-			if (conn_info) {
-				if (params->id = conn_info->dest_params->id &&
-				    params->protocol = conn_info->dest_params->protocol)
-					return conn_info->conn_id;
-			}
+			if (params->id = conn_info->dest_params->id &&
+			    params->protocol = conn_info->dest_params->protocol)
+				return conn_info->conn_id;

A similar patch was sent earlier and is now applied:
https://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git/commit/?id036184e9d4a5b2b42a70b66db9455808dd5da9

Cheers,
Samuel.