Skip to content

Commit

Permalink
soc: qcom: rpmh: Update rpmh_invalidate function to return void
Browse files Browse the repository at this point in the history
Currently rpmh_invalidate() always returns success. Update its
return type to void.

Reviewed-by: Lina Iyer <ilina@codeaurora.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Suggested-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
Link: https://lore.kernel.org/r/1592485553-29163-1-git-send-email-mkshah@codeaurora.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
  • Loading branch information
mkshahc authored and andersson committed Jun 22, 2020
1 parent 681b091 commit 73edcd3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
6 changes: 1 addition & 5 deletions drivers/interconnect/qcom/bcm-voter.c
Original file line number Diff line number Diff line change
Expand Up @@ -266,11 +266,7 @@ int qcom_icc_bcm_voter_commit(struct bcm_voter *voter)
if (!commit_idx[0])
goto out;

ret = rpmh_invalidate(voter->dev);
if (ret) {
pr_err("Error invalidating RPMH client (%d)\n", ret);
goto out;
}
rpmh_invalidate(voter->dev);

ret = rpmh_write_batch(voter->dev, RPMH_ACTIVE_ONLY_STATE,
cmds, commit_idx);
Expand Down
4 changes: 1 addition & 3 deletions drivers/soc/qcom/rpmh.c
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ int rpmh_flush(struct rpmh_ctrlr *ctrlr)
*
* Invalidate the sleep and wake values in batch_cache.
*/
int rpmh_invalidate(const struct device *dev)
void rpmh_invalidate(const struct device *dev)
{
struct rpmh_ctrlr *ctrlr = get_rpmh_ctrlr(dev);
struct batch_cache_req *req, *tmp;
Expand All @@ -509,7 +509,5 @@ int rpmh_invalidate(const struct device *dev)
INIT_LIST_HEAD(&ctrlr->batch_cache);
ctrlr->dirty = true;
spin_unlock_irqrestore(&ctrlr->cache_lock, flags);

return 0;
}
EXPORT_SYMBOL(rpmh_invalidate);
7 changes: 4 additions & 3 deletions include/soc/qcom/rpmh.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ int rpmh_write_async(const struct device *dev, enum rpmh_state state,
int rpmh_write_batch(const struct device *dev, enum rpmh_state state,
const struct tcs_cmd *cmd, u32 *n);

int rpmh_invalidate(const struct device *dev);
void rpmh_invalidate(const struct device *dev);

#else

Expand All @@ -38,8 +38,9 @@ static inline int rpmh_write_batch(const struct device *dev,
const struct tcs_cmd *cmd, u32 *n)
{ return -ENODEV; }

static inline int rpmh_invalidate(const struct device *dev)
{ return -ENODEV; }
static inline void rpmh_invalidate(const struct device *dev)
{
}

#endif /* CONFIG_QCOM_RPMH */

Expand Down

0 comments on commit 73edcd3

Please sign in to comment.