Commit 7269d767 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'coresight-next-v6.11' of... 

Merge tag 'coresight-next-v6.11' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/coresight/linux

 into char-misc-next

Suzuki writes:

coresight: Updates for v6.11

Coresight/hwtracing subsystem updates targeting v6.11 includes a few minor
fixes and cleanups

Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>

* tag 'coresight-next-v6.11' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/coresight/linux:
  hwtracing: use for_each_endpoint_of_node()
  coresight: constify the struct device_type usage
  coresight: tmc: Remove duplicated include in coresight-tmc-core.c
  coresight: Fix ref leak when of_coresight_parse_endpoint() fails
parents 7254a298 2e5657aa

drivers/hwtracing/coresight/coresight-platform.c

+5 −3
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static int of_get_coresight_platform_data(struct device *dev, 
	 */

	if (!parent) {

		/*

		 * Avoid warnings in of_graph_get_next_endpoint()

		 * Avoid warnings in for_each_endpoint_of_node()

		 * if the device doesn't have any graph connections

		 */

		if (!of_graph_is_present(node))
@@ -286,7 +286,7 @@ static int of_get_coresight_platform_data(struct device *dev, 
	}



	/* Iterate through each output port to discover topology */

	while ((ep = of_graph_get_next_endpoint(parent, ep))) {

	for_each_endpoint_of_node(parent, ep) {

		/*

		 * Legacy binding mixes input/output ports under the

		 * same parent. So, skip the input ports if we are dealing
@@ -297,9 +297,11 @@ static int of_get_coresight_platform_data(struct device *dev, 
			continue;



		ret = of_coresight_parse_endpoint(dev, ep, pdata);

		if (ret)

		if (ret) {

			of_node_put(ep);

			return ret;

		}

	}



	return 0;

}

drivers/hwtracing/coresight/coresight-priv.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <linux/pm_runtime.h>



extern struct mutex coresight_mutex;

extern struct device_type coresight_dev_type[];

extern const struct device_type coresight_dev_type[];



/*

 * Coresight management registers (0xf00-0xfcc)

drivers/hwtracing/coresight/coresight-sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ static struct attribute *coresight_source_attrs[] = { 
};

ATTRIBUTE_GROUPS(coresight_source);



struct device_type coresight_dev_type[] = {

const struct device_type coresight_dev_type[] = {

	[CORESIGHT_DEV_TYPE_SINK] = {

		.name = "sink",

		.groups = coresight_sink_groups,

drivers/hwtracing/coresight/coresight-tmc-core.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/coresight.h>

#include <linux/amba/bus.h>

#include <linux/platform_device.h>

#include <linux/acpi.h>



#include "coresight-priv.h"

#include "coresight-tmc.h"