Commit c1407ac1 authored by AngeloGioacchino Del Regno's avatar AngeloGioacchino Del Regno Committed by Mathieu Poirier
Browse files

remoteproc: mtk_scp: Use devm variant of rproc_alloc() 



To simplify the probe function, switch from using rproc_alloc() to
devm_rproc_alloc(); while at it, also put everything on a single line,
as it acceptably fits in 82 columns.

Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20220124120915.41292-1-angelogioacchino.delregno@collabora.com


Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
parent 26291c54

drivers/remoteproc/mtk_scp.c

+3 −10
Original line number Diff line number Diff line
@@ -756,11 +756,7 @@ static int scp_probe(struct platform_device *pdev) 
	char *fw_name = "scp.img";

	int ret, i;



	rproc = rproc_alloc(dev,

			    np->name,

			    &scp_ops,

			    fw_name,

			    sizeof(*scp));

	rproc = devm_rproc_alloc(dev, np->name, &scp_ops, fw_name, sizeof(*scp));

	if (!rproc) {

		dev_err(dev, "unable to allocate remoteproc\n");

		return -ENOMEM;
@@ -776,8 +772,7 @@ static int scp_probe(struct platform_device *pdev) 
	scp->sram_base = devm_ioremap_resource(dev, res);

	if (IS_ERR((__force void *)scp->sram_base)) {

		dev_err(dev, "Failed to parse and map sram memory\n");

		ret = PTR_ERR((__force void *)scp->sram_base);

		goto free_rproc;

		return PTR_ERR((__force void *)scp->sram_base);

	}

	scp->sram_size = resource_size(res);

	scp->sram_phys = res->start;
@@ -789,7 +784,7 @@ static int scp_probe(struct platform_device *pdev) 
		ret = PTR_ERR((__force void *)scp->l1tcm_base);

		if (ret != -EINVAL) {

			dev_err(dev, "Failed to map l1tcm memory\n");

			goto free_rproc;

			return ret;

		}

	} else {

		scp->l1tcm_size = resource_size(res);
@@ -851,8 +846,6 @@ static int scp_probe(struct platform_device *pdev) 
	for (i = 0; i < SCP_IPI_MAX; i++)

		mutex_destroy(&scp->ipi_desc[i].lock);

	mutex_destroy(&scp->send_lock);

free_rproc:

	rproc_free(rproc);



	return ret;

}