Hi Greg,
On Wed, 6 May 2020 at 23:36, Calvin Johnson <[email protected]> wrote:
>
> fwnode_find_reference() doesn't return NULL and hence that check
> should be avoided.
>
> Signed-off-by: Calvin Johnson <[email protected]>
> Reviewed-by: Mathieu Poirier <[email protected]>
I just noticed you were not CC'ed on the original conversation Calvin
and I had and as such you probably don't know what to do with this
patch. Please see if you can pick it up as a fix for 5.7. If that is
not possible I will queue it up for inclusion in the 5.8 cycle.
Thanks,
Mathieu
> ---
>
> 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
>
