Commit 61d1961a authored by Stephan Gerhold's avatar Stephan Gerhold Committed by Bjorn Andersson
Browse files

soc: qcom: smem_state: Add devm_qcom_smem_state_get() 



It is easy to forget to call qcom_smem_state_put() after
a qcom_smem_state_get(). Introduce a devm_qcom_smem_state_get()
helper function that automates this so that qcom_smem_state_put()
is automatically called when a device is removed.

Signed-off-by: default avatarStephan Gerhold <stephan@gerhold.net>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20210618111556.53416-1-stephan@gerhold.net


Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent 30da589d

drivers/soc/qcom/smem_state.c

+36 −0
Original line number Diff line number Diff line
@@ -151,6 +151,42 @@ void qcom_smem_state_put(struct qcom_smem_state *state) 
}

EXPORT_SYMBOL_GPL(qcom_smem_state_put);



static void devm_qcom_smem_state_release(struct device *dev, void *res)

{

	qcom_smem_state_put(*(struct qcom_smem_state **)res);

}



/**

 * devm_qcom_smem_state_get() - acquire handle to a devres managed state

 * @dev:	client device pointer

 * @con_id:	name of the state to lookup

 * @bit:	flags from the state reference, indicating which bit's affected

 *

 * Returns handle to the state, or ERR_PTR(). qcom_smem_state_put() is called

 * automatically when @dev is removed.

 */

struct qcom_smem_state *devm_qcom_smem_state_get(struct device *dev,

						 const char *con_id,

						 unsigned *bit)

{

	struct qcom_smem_state **ptr, *state;



	ptr = devres_alloc(devm_qcom_smem_state_release, sizeof(*ptr), GFP_KERNEL);

	if (!ptr)

		return ERR_PTR(-ENOMEM);



	state = qcom_smem_state_get(dev, con_id, bit);

	if (!IS_ERR(state)) {

		*ptr = state;

		devres_add(dev, ptr);

	} else {

		devres_free(ptr);

	}



	return state;

}

EXPORT_SYMBOL_GPL(devm_qcom_smem_state_get);



/**

 * qcom_smem_state_register() - register a new state

 * @of_node:	of_node used for matching client lookups

include/linux/soc/qcom/smem_state.h

+8 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ struct qcom_smem_state_ops { 
#ifdef CONFIG_QCOM_SMEM_STATE



struct qcom_smem_state *qcom_smem_state_get(struct device *dev, const char *con_id, unsigned *bit);

struct qcom_smem_state *devm_qcom_smem_state_get(struct device *dev, const char *con_id, unsigned *bit);

void qcom_smem_state_put(struct qcom_smem_state *);



int qcom_smem_state_update_bits(struct qcom_smem_state *state, u32 mask, u32 value);
@@ -29,6 +30,13 @@ static inline struct qcom_smem_state *qcom_smem_state_get(struct device *dev, 
	return ERR_PTR(-EINVAL);

}



static inline struct qcom_smem_state *devm_qcom_smem_state_get(struct device *dev,

							       const char *con_id,

							       unsigned *bit)

{

	return ERR_PTR(-EINVAL);

}



static inline void qcom_smem_state_put(struct qcom_smem_state *state)

{

}