soc: qcom: rpmh-rsc: Don't double-check rpmh payload (dded0317) · Commits · 戴 / test

The calls rpmh_rsc_write_ctrl_data() and rpmh_rsc_send_data() are only ever called from rpmh.c. We know that rpmh.c already error checked the message. There's no reason to do it again in rpmh-rsc. Suggested-by:

Maulik Shah <mkshah@codeaurora.org> Signed-off-by:

Douglas Anderson <dianders@chromium.org> Reviewed-by:

Maulik Shah <mkshah@codeaurora.org> Reviewed-by:

Stephen Boyd <swboyd@chromium.org> Tested-by:

Maulik Shah <mkshah@codeaurora.org> Link: https://lore.kernel.org/r/20200413100321.v4.8.I8e187cdfb7a31f5bb7724f1f937f2862ee464a35@changeid Signed-off-by:

Bjorn Andersson <bjorn.andersson@linaro.org>

drivers/soc/qcom/rpmh-rsc.c

+1 −17

Original line number	Diff line number	Diff line
		@@ -634,7 +634,7 @@ done_write:
		}

		/**
		* rpmh_rsc_send_data() - Validate the incoming message + write to TCS block.
		* rpmh_rsc_send_data() - Write / trigger active-only message.
		* @drv: The controller.
		* @msg: The data to be sent.
		*
		@@ -659,12 +659,6 @@ int rpmh_rsc_send_data(struct rsc_drv drv, const struct tcs_request msg)
		{
		int ret;

		if (!msg \|\| !msg->cmds \|\| !msg->num_cmds \|\|
		msg->num_cmds > MAX_RPMH_PAYLOAD) {
		WARN_ON(1);
		return -EINVAL;
		}

		do {
		ret = tcs_write(drv, msg);
		if (ret == -EBUSY) {
		@@ -735,16 +729,6 @@ int rpmh_rsc_write_ctrl_data(struct rsc_drv drv, const struct tcs_request msg)
		unsigned long flags;
		int ret;

		if (!msg \|\| !msg->cmds \|\| !msg->num_cmds \|\|
		msg->num_cmds > MAX_RPMH_PAYLOAD) {
		pr_err("Payload error\n");
		return -EINVAL;
		}

		/* Data sent to this API will not be sent immediately */
		if (msg->state == RPMH_ACTIVE_ONLY_STATE)
		return -EINVAL;

		tcs = get_tcs_for_msg(drv, msg);
		if (IS_ERR(tcs))
		return PTR_ERR(tcs);

Admin message