2020-05-05 13:44:45

by Calvin Johnson

Subject: [PATCH] coresight: cti: remove incorrect NULL return check

fwnode_find_reference() doesn't return NULL and hence that check
should be avoided.

Signed-off-by: Calvin Johnson <[email protected]>
---

drivers/hwtracing/coresight/coresight-cti-platform.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-cti-platform.c b/drivers/hwtracing/coresight/coresight-cti-platform.c
index b44d83142b62..2fdaeec80ee5 100644
--- a/drivers/hwtracing/coresight/coresight-cti-platform.c
+++ b/drivers/hwtracing/coresight/coresight-cti-platform.c
@@ -120,7 +120,7 @@ static int cti_plat_create_v8_etm_connection(struct device *dev,

/* Can optionally have an etm node - return if not */
cs_fwnode = fwnode_find_reference(root_fwnode, CTI_DT_CSDEV_ASSOC, 0);
- if (IS_ERR_OR_NULL(cs_fwnode))
+ if (IS_ERR(cs_fwnode))
return 0;

/* allocate memory */
@@ -393,7 +393,7 @@ static int cti_plat_create_connection(struct device *dev,
/* associated device ? */
cs_fwnode = fwnode_find_reference(fwnode,
CTI_DT_CSDEV_ASSOC, 0);
- if (!IS_ERR_OR_NULL(cs_fwnode)) {
+ if (!IS_ERR(cs_fwnode)) {
assoc_name = cti_plat_get_csdev_or_node_name(cs_fwnode,
&csdev);
fwnode_handle_put(cs_fwnode);
--
2.17.1

2020-05-06 17:08:00

by Mathieu Poirier

Subject: Re: [PATCH] coresight: cti: remove incorrect NULL return check

On Tue, May 05, 2020 at 07:10:20PM +0530, Calvin Johnson wrote:
> fwnode_find_reference() doesn't return NULL and hence that check
> should be avoided.
>
> Signed-off-by: Calvin Johnson <[email protected]>
> ---
>
> drivers/hwtracing/coresight/coresight-cti-platform.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hwtracing/coresight/coresight-cti-platform.c b/drivers/hwtracing/coresight/coresight-cti-platform.c
> index b44d83142b62..2fdaeec80ee5 100644
> --- a/drivers/hwtracing/coresight/coresight-cti-platform.c
> +++ b/drivers/hwtracing/coresight/coresight-cti-platform.c
> @@ -120,7 +120,7 @@ static int cti_plat_create_v8_etm_connection(struct device *dev,
>
> /* Can optionally have an etm node - return if not */
> cs_fwnode = fwnode_find_reference(root_fwnode, CTI_DT_CSDEV_ASSOC, 0);
> - if (IS_ERR_OR_NULL(cs_fwnode))
> + if (IS_ERR(cs_fwnode))
> return 0;
>
> /* allocate memory */
> @@ -393,7 +393,7 @@ static int cti_plat_create_connection(struct device *dev,
> /* associated device ? */
> cs_fwnode = fwnode_find_reference(fwnode,
> CTI_DT_CSDEV_ASSOC, 0);
> - if (!IS_ERR_OR_NULL(cs_fwnode)) {
> + if (!IS_ERR(cs_fwnode)) {
> assoc_name = cti_plat_get_csdev_or_node_name(cs_fwnode,
> &csdev);

You are correct.

Reviewed-by: Mathieu Poirier <[email protected]>

Greg, can you pick this up as a fix for 5.7?

Thanks,
Mathieu

> fwnode_handle_put(cs_fwnode);
> --
> 2.17.1
>