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: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
Link: https://lore.kernel.org/r/1606379490-4052-1-git-send-email-mkshah@codeaurora.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/drivers/soc/qcom/rpmh.c b/drivers/soc/qcom/rpmh.c
index ad1f062620ff8964605e8481dd8e2dc167e7a804..01765ee9cdfb8db2ed61ca85b1602922de7ba889 100644 (file)
--- a/drivers/soc/qcom/rpmh.c
+++ b/drivers/soc/qcom/rpmh.c
@@ -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)