Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

coresight: Use local coresight_desc instances 



Each coresight device prepares a description for coresight_register()
in struct coresight_desc. Once we register the device, the description is
useless and can be freed. The coresight_desc is small enough (48bytes on
64bit)i to be allocated on the stack. Hence use an automatic variable to
avoid a needless dynamic allocation and wasting the memory(which will only
be free'd when the device is destroyed).

Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Pratik Patel <pratikp@codeaurora.org>
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 7f73b0b9

drivers/hwtracing/coresight/coresight-etb10.c

+8 −12
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id) 
	struct coresight_platform_data *pdata = NULL;

	struct etb_drvdata *drvdata;

	struct resource *res = &adev->res;

	struct coresight_desc *desc;

	struct coresight_desc desc = { 0 };

	struct device_node *np = adev->dev.of_node;



	if (np) {
@@ -682,17 +682,13 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id) 
		return -ENOMEM;

	}



	desc = devm_kzalloc(dev, sizeof(*desc), GFP_KERNEL);

	if (!desc)

		return -ENOMEM;



	desc->type = CORESIGHT_DEV_TYPE_SINK;

	desc->subtype.sink_subtype = CORESIGHT_DEV_SUBTYPE_SINK_BUFFER;

	desc->ops = &etb_cs_ops;

	desc->pdata = pdata;

	desc->dev = dev;

	desc->groups = coresight_etb_groups;

	drvdata->csdev = coresight_register(desc);

	desc.type = CORESIGHT_DEV_TYPE_SINK;

	desc.subtype.sink_subtype = CORESIGHT_DEV_SUBTYPE_SINK_BUFFER;

	desc.ops = &etb_cs_ops;

	desc.pdata = pdata;

	desc.dev = dev;

	desc.groups = coresight_etb_groups;

	drvdata->csdev = coresight_register(&desc);

	if (IS_ERR(drvdata->csdev))

		return PTR_ERR(drvdata->csdev);

drivers/hwtracing/coresight/coresight-etm3x.c

+8 −12
Original line number Diff line number Diff line
@@ -756,13 +756,9 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id) 
	struct coresight_platform_data *pdata = NULL;

	struct etm_drvdata *drvdata;

	struct resource *res = &adev->res;

	struct coresight_desc *desc;

	struct coresight_desc desc = { 0 };

	struct device_node *np = adev->dev.of_node;



	desc = devm_kzalloc(dev, sizeof(*desc), GFP_KERNEL);

	if (!desc)

		return -ENOMEM;



	drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);

	if (!drvdata)

		return -ENOMEM;
@@ -825,13 +821,13 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id) 
	etm_init_trace_id(drvdata);

	etm_set_default(&drvdata->config);



	desc->type = CORESIGHT_DEV_TYPE_SOURCE;

	desc->subtype.source_subtype = CORESIGHT_DEV_SUBTYPE_SOURCE_PROC;

	desc->ops = &etm_cs_ops;

	desc->pdata = pdata;

	desc->dev = dev;

	desc->groups = coresight_etm_groups;

	drvdata->csdev = coresight_register(desc);

	desc.type = CORESIGHT_DEV_TYPE_SOURCE;

	desc.subtype.source_subtype = CORESIGHT_DEV_SUBTYPE_SOURCE_PROC;

	desc.ops = &etm_cs_ops;

	desc.pdata = pdata;

	desc.dev = dev;

	desc.groups = coresight_etm_groups;

	drvdata->csdev = coresight_register(&desc);

	if (IS_ERR(drvdata->csdev)) {

		ret = PTR_ERR(drvdata->csdev);

		goto err_arch_supported;

drivers/hwtracing/coresight/coresight-etm4x.c

+8 −12
Original line number Diff line number Diff line
@@ -711,13 +711,9 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) 
	struct coresight_platform_data *pdata = NULL;

	struct etmv4_drvdata *drvdata;

	struct resource *res = &adev->res;

	struct coresight_desc *desc;

	struct coresight_desc desc = { 0 };

	struct device_node *np = adev->dev.of_node;



	desc = devm_kzalloc(dev, sizeof(*desc), GFP_KERNEL);

	if (!desc)

		return -ENOMEM;



	drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);

	if (!drvdata)

		return -ENOMEM;
@@ -772,13 +768,13 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) 
	etm4_init_trace_id(drvdata);

	etm4_set_default(&drvdata->config);



	desc->type = CORESIGHT_DEV_TYPE_SOURCE;

	desc->subtype.source_subtype = CORESIGHT_DEV_SUBTYPE_SOURCE_PROC;

	desc->ops = &etm4_cs_ops;

	desc->pdata = pdata;

	desc->dev = dev;

	desc->groups = coresight_etmv4_groups;

	drvdata->csdev = coresight_register(desc);

	desc.type = CORESIGHT_DEV_TYPE_SOURCE;

	desc.subtype.source_subtype = CORESIGHT_DEV_SUBTYPE_SOURCE_PROC;

	desc.ops = &etm4_cs_ops;

	desc.pdata = pdata;

	desc.dev = dev;

	desc.groups = coresight_etmv4_groups;

	drvdata->csdev = coresight_register(&desc);

	if (IS_ERR(drvdata->csdev)) {

		ret = PTR_ERR(drvdata->csdev);

		goto err_arch_supported;

drivers/hwtracing/coresight/coresight-funnel.c

+8 −12
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static int funnel_probe(struct amba_device *adev, const struct amba_id *id) 
	struct coresight_platform_data *pdata = NULL;

	struct funnel_drvdata *drvdata;

	struct resource *res = &adev->res;

	struct coresight_desc *desc;

	struct coresight_desc desc = { 0 };

	struct device_node *np = adev->dev.of_node;



	if (np) {
@@ -207,17 +207,13 @@ static int funnel_probe(struct amba_device *adev, const struct amba_id *id) 
	drvdata->base = base;

	pm_runtime_put(&adev->dev);



	desc = devm_kzalloc(dev, sizeof(*desc), GFP_KERNEL);

	if (!desc)

		return -ENOMEM;



	desc->type = CORESIGHT_DEV_TYPE_LINK;

	desc->subtype.link_subtype = CORESIGHT_DEV_SUBTYPE_LINK_MERG;

	desc->ops = &funnel_cs_ops;

	desc->pdata = pdata;

	desc->dev = dev;

	desc->groups = coresight_funnel_groups;

	drvdata->csdev = coresight_register(desc);

	desc.type = CORESIGHT_DEV_TYPE_LINK;

	desc.subtype.link_subtype = CORESIGHT_DEV_SUBTYPE_LINK_MERG;

	desc.ops = &funnel_cs_ops;

	desc.pdata = pdata;

	desc.dev = dev;

	desc.groups = coresight_funnel_groups;

	drvdata->csdev = coresight_register(&desc);

	if (IS_ERR(drvdata->csdev))

		return PTR_ERR(drvdata->csdev);

drivers/hwtracing/coresight/coresight-replicator-qcom.c

+7 −11
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static int replicator_probe(struct amba_device *adev, const struct amba_id *id) 
	struct resource *res = &adev->res;

	struct coresight_platform_data *pdata = NULL;

	struct replicator_state *drvdata;

	struct coresight_desc *desc;

	struct coresight_desc desc = { 0 };

	struct device_node *np = adev->dev.of_node;

	void __iomem *base;
@@ -134,16 +134,12 @@ static int replicator_probe(struct amba_device *adev, const struct amba_id *id) 
	dev_set_drvdata(dev, drvdata);

	pm_runtime_put(&adev->dev);



	desc = devm_kzalloc(dev, sizeof(*desc), GFP_KERNEL);

	if (!desc)

		return -ENOMEM;



	desc->type = CORESIGHT_DEV_TYPE_LINK;

	desc->subtype.link_subtype = CORESIGHT_DEV_SUBTYPE_LINK_SPLIT;

	desc->ops = &replicator_cs_ops;

	desc->pdata = adev->dev.platform_data;

	desc->dev = &adev->dev;

	drvdata->csdev = coresight_register(desc);

	desc.type = CORESIGHT_DEV_TYPE_LINK;

	desc.subtype.link_subtype = CORESIGHT_DEV_SUBTYPE_LINK_SPLIT;

	desc.ops = &replicator_cs_ops;

	desc.pdata = adev->dev.platform_data;

	desc.dev = &adev->dev;

	drvdata->csdev = coresight_register(&desc);

	if (IS_ERR(drvdata->csdev))

		return PTR_ERR(drvdata->csdev);