| Message ID | 20170613163718.GA5375@embeddedgus |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Jun 13, 2017 at 11:37:18AM -0500, Gustavo A. R. Silva wrote: > Remove unnecessary NULL check for pointer conn_info. > conn_info is set in list_for_each_entry() using container_of(), > which is never NULL. > > Addresses-Coverity-ID: 1362349 > Cc: Guenter Roeck <linux@roeck-us.net> > Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > net/nfc/nci/core.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c > index 61fff42..c15cb88 100644 > --- a/net/nfc/nci/core.c > +++ b/net/nfc/nci/core.c > @@ -73,11 +73,10 @@ 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; > } > } > > -- > 2.5.0 >
Hi Gustavo, On Tue, Jun 13, 2017 at 11:37:18AM -0500, Gustavo A. R. Silva wrote: > Remove unnecessary NULL check for pointer conn_info. > conn_info is set in list_for_each_entry() using container_of(), > which is never NULL. > > Addresses-Coverity-ID: 1362349 > Cc: Guenter Roeck <linux@roeck-us.net> > Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com> > --- > net/nfc/nci/core.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) Applied to nfc-next, thanks. Cheers, Samuel.
Hi Samuel, Quoting Samuel Ortiz <sameo@linux.intel.com>: > Hi Gustavo, > > On Tue, Jun 13, 2017 at 11:37:18AM -0500, Gustavo A. R. Silva wrote: >> Remove unnecessary NULL check for pointer conn_info. >> conn_info is set in list_for_each_entry() using container_of(), >> which is never NULL. >> >> Addresses-Coverity-ID: 1362349 >> Cc: Guenter Roeck <linux@roeck-us.net> >> Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com> >> --- >> net/nfc/nci/core.c | 9 ++++----- >> 1 file changed, 4 insertions(+), 5 deletions(-) > Applied to nfc-next, thanks. > Absolutely, glad to help. Thanks -- Gustavo A. R. Silva
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index 61fff42..c15cb88 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c @@ -73,11 +73,10 @@ 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; } }
Remove unnecessary NULL check for pointer conn_info. conn_info is set in list_for_each_entry() using container_of(), which is never NULL. Addresses-Coverity-ID: 1362349 Cc: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com> --- net/nfc/nci/core.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)