Commit a15dab75 authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Greg Kroah-Hartman
Browse files

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: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 88a1607c

drivers/hwtracing/coresight/coresight-funnel.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

drivers/hwtracing/coresight/coresight-replicator.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE