soc: qcom: rpmh: Update rpmh_invalidate function to return void (73edcd38) · Commits · 戴 / test

drivers/interconnect/qcom/bcm-voter.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -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);

+1 −3

Original line number	Diff line number	Diff line
		@@ -497,7 +497,7 @@ exit:
		*
		* 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;
		@@ -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);

+4 −3

Original line number	Diff line number	Diff line
		@@ -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

		@@ -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 */