msm: msm_bus: Adjust active and dual votes to prevent double voting

Sleep votes are currently treated as dual context votes with the
rpmh iteration of the bus driver, change update_bw_adhoc to clear
active ib/ab votes from non active only clients to prevent
a double bandwidth vote. Rename slp_ib/slp_ab to dual_ib/dual_ab
to better describe its purpose.

Change-Id: I838b547521c3597016744b06e34224b5b8c092ba
Signed-off-by: David Dai <daidavid1@codeaurora.org>
diff --git a/include/linux/msm-bus.h b/include/linux/msm-bus.h
index 26e948f..c298666 100644
--- a/include/linux/msm-bus.h
+++ b/include/linux/msm-bus.h
@@ -87,8 +87,8 @@
 	struct device *mas_dev;
 	u64 cur_act_ib;
 	u64 cur_act_ab;
-	u64 cur_slp_ib;
-	u64 cur_slp_ab;
+	u64 cur_dual_ib;
+	u64 cur_dual_ab;
 	bool active_only;
 };
 
@@ -125,7 +125,7 @@
 void msm_bus_scale_unregister(struct msm_bus_client_handle *cl);
 int msm_bus_scale_update_bw(struct msm_bus_client_handle *cl, u64 ab, u64 ib);
 int msm_bus_scale_update_bw_context(struct msm_bus_client_handle *cl,
-		u64 act_ab, u64 act_ib, u64 slp_ib, u64 slp_ab);
+		u64 act_ab, u64 act_ib, u64 dual_ib, u64 dual_ab);
 int msm_bus_scale_query_tcs_cmd(struct msm_bus_tcs_usecase *tcs_usecase,
 					uint32_t cl, unsigned int index);
 int msm_bus_scale_query_tcs_cmd_all(struct msm_bus_tcs_handle *tcs_handle,
@@ -192,7 +192,7 @@
 
 static inline int
 msm_bus_scale_update_bw_context(struct msm_bus_client_handle *cl, u64 act_ab,
-				u64 act_ib, u64 slp_ib, u64 slp_ab)
+				u64 act_ib, u64 dual_ib, u64 dual_ab)
 
 {
 	return 0;