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

coresight: platform: Make memory allocation helper generic 



Rename the of_coresight_alloc_memory() => coresight_alloc_conns()
as it is independent of the underlying firmware type. This is in
preparation for the ACPI support.

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 22aa495a

drivers/hwtracing/coresight/coresight-platform.c

+19 −15
Original line number Diff line number Diff line
@@ -17,6 +17,24 @@ 
#include <linux/cpumask.h>

#include <asm/smp_plat.h>



/*

 * coresight_alloc_conns: Allocate connections record for each output

 * port from the device.

 */

static int coresight_alloc_conns(struct device *dev,

				 struct coresight_platform_data *pdata)

{

	if (pdata->nr_outport) {

		pdata->conns = devm_kzalloc(dev, pdata->nr_outport *

					    sizeof(*pdata->conns),

					    GFP_KERNEL);

		if (!pdata->conns)

			return -ENOMEM;

	}



	return 0;

}



#ifdef CONFIG_OF

static int of_dev_node_match(struct device *dev, void *data)

{
@@ -133,20 +151,6 @@ static void of_coresight_get_ports(const struct device_node *node, 
	}

}



static int of_coresight_alloc_memory(struct device *dev,

			struct coresight_platform_data *pdata)

{

	if (pdata->nr_outport) {

		pdata->conns = devm_kzalloc(dev, pdata->nr_outport *

					    sizeof(*pdata->conns),

					    GFP_KERNEL);

		if (!pdata->conns)

			return -ENOMEM;

	}



	return 0;

}



int of_coresight_get_cpu(const struct device_node *node)

{

	int cpu;
@@ -252,7 +256,7 @@ of_get_coresight_platform_data(struct device *dev, 
	if (!pdata->nr_outport)

		return pdata;



	ret = of_coresight_alloc_memory(dev, pdata);

	ret = coresight_alloc_conns(dev, pdata);

	if (ret)

		return ERR_PTR(ret);

CRA Git | Maintained and supported by SUSTech CRA and CCSE