coresight: Make sure device uses DT for obsolete compatible check

As we prepare to add support for ACPI bindings, let us make sure we do
the compatible check only if we are sure we are dealing with a DT based
system.

Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/hwtracing/coresight/coresight-funnel.c b/drivers/hwtracing/coresight/coresight-funnel.c
index 6236a84..3423042 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-funnel.c
+++ b/drivers/hwtracing/coresight/coresight-funnel.c
@@ -196,7 +196,8 @@ static int funnel_probe(struct device *dev, struct resource *res)
                dev->platform_data = pdata;
        }
 
-       if (of_device_is_compatible(np, "arm,coresight-funnel"))
+       if (is_of_node(dev_fwnode(dev)) &&
+           of_device_is_compatible(dev->of_node, "arm,coresight-funnel"))
                pr_warn_once("Uses OBSOLETE CoreSight funnel binding\n");
 
        drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);

diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c
index ee6ad34..7e05145 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-replicator.c
+++ b/drivers/hwtracing/coresight/coresight-replicator.c
@@ -187,7 +187,8 @@ static int replicator_probe(struct device *dev, struct resource *res)
                dev->platform_data = pdata;
        }
 
-       if (of_device_is_compatible(np, "arm,coresight-replicator"))
+       if (is_of_node(dev_fwnode(dev)) &&
+           of_device_is_compatible(dev->of_node, "arm,coresight-replicator"))
                pr_warn_once("Uses OBSOLETE CoreSight replicator binding\n");
 
        drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);