Commit 20635bcc authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Bjorn Andersson
Browse files

soc: qcom: ocmem: simplify with cleanup.h 



Allocate the memory with scoped/cleanup.h to reduce error handling (less
error paths) and make the code a bit simpler.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20240703-thermal-const-v1-3-6e59e139c65d@linaro.org


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent 01dd825d

drivers/soc/qcom/ocmem.c

+4 −6
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */



#include <linux/bitfield.h>

#include <linux/cleanup.h>

#include <linux/clk.h>

#include <linux/io.h>

#include <linux/kernel.h>
@@ -216,7 +217,6 @@ EXPORT_SYMBOL_GPL(of_get_ocmem); 
struct ocmem_buf *ocmem_allocate(struct ocmem *ocmem, enum ocmem_client client,

				 unsigned long size)

{

	struct ocmem_buf *buf;

	int ret;



	/* TODO: add support for other clients... */
@@ -229,7 +229,7 @@ struct ocmem_buf *ocmem_allocate(struct ocmem *ocmem, enum ocmem_client client, 
	if (test_and_set_bit_lock(BIT(client), &ocmem->active_allocations))

		return ERR_PTR(-EBUSY);



	buf = kzalloc(sizeof(*buf), GFP_KERNEL);

	struct ocmem_buf *buf __free(kfree) = kzalloc(sizeof(*buf), GFP_KERNEL);

	if (!buf) {

		ret = -ENOMEM;

		goto err_unlock;
@@ -247,7 +247,7 @@ struct ocmem_buf *ocmem_allocate(struct ocmem *ocmem, enum ocmem_client client, 
		if (ret) {

			dev_err(ocmem->dev, "could not lock: %d\n", ret);

			ret = -EINVAL;

			goto err_kfree;

			goto err_unlock;

		}

	} else {

		ocmem_write(ocmem, OCMEM_REG_GFX_MPU_START, buf->offset);
@@ -258,10 +258,8 @@ struct ocmem_buf *ocmem_allocate(struct ocmem *ocmem, enum ocmem_client client, 
	dev_dbg(ocmem->dev, "using %ldK of OCMEM at 0x%08lx for client %d\n",

		size / 1024, buf->addr, client);



	return buf;

	return_ptr(buf);



err_kfree:

	kfree(buf);

err_unlock:

	clear_bit_unlock(BIT(client), &ocmem->active_allocations);