2017-06-14 07:49:55

by Dan Carpenter

Subject: [PATCH] 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]>

diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 61fff422424f..5542fc72f020 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -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;
}
}

2017-06-22 22:48:14

by Samuel Ortiz

Subject: Re: [PATCH] NFC: nci: Remove an unneeded NULL check

Hi Dan,

On Wed, Jun 14, 2017 at 10:49:46AM +0300, Dan Carpenter wrote:
> "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]>
>
> diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
> index 61fff422424f..5542fc72f020 100644
> --- a/net/nfc/nci/core.c
> +++ b/net/nfc/nci/core.c
> @@ -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;
A similar patch was sent earlier and is now applied:
https://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git/commit/?id=03036184e9d4a5b2b42a70b66db9455808dd5da9

Cheers,
Samuel.