Commit 0924dad5 authored by Maulik Shah's avatar Maulik Shah Committed by Bjorn Andersson
Browse files

soc: qcom: rpmh: Use __fill_rpmh_msg API during rpmh_write() 



Use __fill_rpmh_msg API during rpmh_write(). This allows to
remove duplication of code in error checking, copying commands
and setting message state.

Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarMaulik Shah <mkshah@codeaurora.org>
Link: https://lore.kernel.org/r/1606379490-4052-1-git-send-email-mkshah@codeaurora.org


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

drivers/soc/qcom/rpmh.c

+3 −9
Original line number Diff line number Diff line
@@ -181,8 +181,6 @@ static int __rpmh_write(const struct device *dev, enum rpmh_state state, 
	struct cache_req *req;

	int i;



	rpm_msg->msg.state = state;



	/* Cache the request in our store and link the payload */

	for (i = 0; i < rpm_msg->msg.num_cmds; i++) {

		req = cache_rpm_request(ctrlr, state, &rpm_msg->msg.cmds[i]);
@@ -190,8 +188,6 @@ static int __rpmh_write(const struct device *dev, enum rpmh_state state, 
			return PTR_ERR(req);

	}



	rpm_msg->msg.state = state;



	if (state == RPMH_ACTIVE_ONLY_STATE) {

		WARN_ON(irqs_disabled());

		ret = rpmh_rsc_send_data(ctrlr_to_drv(ctrlr), &rpm_msg->msg);
@@ -268,11 +264,9 @@ int rpmh_write(const struct device *dev, enum rpmh_state state, 
	DEFINE_RPMH_MSG_ONSTACK(dev, state, &compl, rpm_msg);

	int ret;



	if (!cmd || !n || n > MAX_RPMH_PAYLOAD)

		return -EINVAL;



	memcpy(rpm_msg.cmd, cmd, n * sizeof(*cmd));

	rpm_msg.msg.num_cmds = n;

	ret = __fill_rpmh_msg(&rpm_msg, state, cmd, n);

	if (ret)

		return ret;



	ret = __rpmh_write(dev, state, &rpm_msg);

	if (ret)

CRA Git | Maintained and supported by SUSTech CRA and CCSE