OPP: Rearrange entries in pm_opp.h

vireshk · vireshk · commit 754833b3194c · 2023-07-21T13:34:54.000+05:30
Rearrange the helper function declarations / definitions to keep them in
order of freq, level and then bw.

Signed-off-by: Viresh Kumar &lt;viresh.kumar@linaro.org&gt;
diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h
@@ -121,17 +121,19 @@ unsigned long dev_pm_opp_get_suspend_opp_freq(struct device *dev);
 struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,
 					      unsigned long freq,
 					      bool available);
+
 struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev,
 					      unsigned long *freq);
 
+struct dev_pm_opp *dev_pm_opp_find_freq_ceil(struct device *dev,
+					     unsigned long *freq);
+
 struct dev_pm_opp *dev_pm_opp_find_level_exact(struct device *dev,
 					       unsigned int level);
+
 struct dev_pm_opp *dev_pm_opp_find_level_ceil(struct device *dev,
 					      unsigned int *level);
 
-struct dev_pm_opp *dev_pm_opp_find_freq_ceil(struct device *dev,
-					     unsigned long *freq);
-
 struct dev_pm_opp *dev_pm_opp_find_bw_ceil(struct device *dev,
 					   unsigned int *bw, int index);
 
@@ -247,32 +249,32 @@ static inline unsigned long dev_pm_opp_get_suspend_opp_freq(struct device *dev)
 	return 0;
 }
 
-static inline struct dev_pm_opp *dev_pm_opp_find_level_exact(struct device *dev,
-					unsigned int level)
+static inline struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,
+					unsigned long freq, bool available)
 {
 	return ERR_PTR(-EOPNOTSUPP);
 }
 
-static inline struct dev_pm_opp *dev_pm_opp_find_level_ceil(struct device *dev,
-					unsigned int *level)
+static inline struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev,
+					unsigned long *freq)
 {
 	return ERR_PTR(-EOPNOTSUPP);
 }
 
-static inline struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,
-					unsigned long freq, bool available)
+static inline struct dev_pm_opp *dev_pm_opp_find_freq_ceil(struct device *dev,
+					unsigned long *freq)
 {
 	return ERR_PTR(-EOPNOTSUPP);
 }
 
-static inline struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev,
-					unsigned long *freq)
+static inline struct dev_pm_opp *dev_pm_opp_find_level_exact(struct device *dev,
+					unsigned int level)
 {
 	return ERR_PTR(-EOPNOTSUPP);
 }
 
-static inline struct dev_pm_opp *dev_pm_opp_find_freq_ceil(struct device *dev,
-					unsigned long *freq)
+static inline struct dev_pm_opp *dev_pm_opp_find_level_ceil(struct device *dev,
+					unsigned int *level)
 {
 	return ERR_PTR(-EOPNOTSUPP);
 }

Original file line number	Diff line number	Diff line change
`@@ -121,17 +121,19 @@ unsigned long dev_pm_opp_get_suspend_opp_freq(struct device *dev);`
`121`	`121`	`struct dev_pm_opp dev_pm_opp_find_freq_exact(struct device dev,`
`122`	`122`	`unsigned long freq,`
`123`	`123`	`bool available);`
	`124`	`+`
`124`	`125`	`struct dev_pm_opp dev_pm_opp_find_freq_floor(struct device dev,`
`125`	`126`	`unsigned long *freq);`
`126`	`127`
	`128`	`+struct dev_pm_opp dev_pm_opp_find_freq_ceil(struct device dev,`
	`129`	`+ unsigned long *freq);`
	`130`	`+`
`127`	`131`	`struct dev_pm_opp dev_pm_opp_find_level_exact(struct device dev,`
`128`	`132`	`unsigned int level);`
	`133`	`+`
`129`	`134`	`struct dev_pm_opp dev_pm_opp_find_level_ceil(struct device dev,`
`130`	`135`	`unsigned int *level);`
`131`	`136`
`132`		`-struct dev_pm_opp dev_pm_opp_find_freq_ceil(struct device dev,`
`133`		`- unsigned long *freq);`
`134`		`-`
`135`	`137`	`struct dev_pm_opp dev_pm_opp_find_bw_ceil(struct device dev,`
`136`	`138`	`unsigned int *bw, int index);`
`137`	`139`
`@@ -247,32 +249,32 @@ static inline unsigned long dev_pm_opp_get_suspend_opp_freq(struct device *dev)`
`247`	`249`	`return 0;`
`248`	`250`	`}`
`249`	`251`
`250`		`-static inline struct dev_pm_opp dev_pm_opp_find_level_exact(struct device dev,`
`251`		`- unsigned int level)`
	`252`	`+static inline struct dev_pm_opp dev_pm_opp_find_freq_exact(struct device dev,`
	`253`	`+ unsigned long freq, bool available)`
`252`	`254`	`{`
`253`	`255`	`return ERR_PTR(-EOPNOTSUPP);`
`254`	`256`	`}`
`255`	`257`
`256`		`-static inline struct dev_pm_opp dev_pm_opp_find_level_ceil(struct device dev,`
`257`		`- unsigned int *level)`
	`258`	`+static inline struct dev_pm_opp dev_pm_opp_find_freq_floor(struct device dev,`
	`259`	`+ unsigned long *freq)`
`258`	`260`	`{`
`259`	`261`	`return ERR_PTR(-EOPNOTSUPP);`
`260`	`262`	`}`
`261`	`263`
`262`		`-static inline struct dev_pm_opp dev_pm_opp_find_freq_exact(struct device dev,`
`263`		`- unsigned long freq, bool available)`
	`264`	`+static inline struct dev_pm_opp dev_pm_opp_find_freq_ceil(struct device dev,`
	`265`	`+ unsigned long *freq)`
`264`	`266`	`{`
`265`	`267`	`return ERR_PTR(-EOPNOTSUPP);`
`266`	`268`	`}`
`267`	`269`
`268`		`-static inline struct dev_pm_opp dev_pm_opp_find_freq_floor(struct device dev,`
`269`		`- unsigned long *freq)`
	`270`	`+static inline struct dev_pm_opp dev_pm_opp_find_level_exact(struct device dev,`
	`271`	`+ unsigned int level)`
`270`	`272`	`{`
`271`	`273`	`return ERR_PTR(-EOPNOTSUPP);`
`272`	`274`	`}`
`273`	`275`
`274`		`-static inline struct dev_pm_opp dev_pm_opp_find_freq_ceil(struct device dev,`
`275`		`- unsigned long *freq)`
	`276`	`+static inline struct dev_pm_opp dev_pm_opp_find_level_ceil(struct device dev,`
	`277`	`+ unsigned int *level)`
`276`	`278`	`{`
`277`	`279`	`return ERR_PTR(-EOPNOTSUPP);`
`278`	`280`	`}`