Skip to content

Commit 746de82

Browse files
committed
OPP: Reuse dev_pm_opp_get_freq_indexed()
Reuse dev_pm_opp_get_freq_indexed() from dev_pm_opp_get_freq(). Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
1 parent 034d6aa commit 746de82

File tree

2 files changed

+5
-28
lines changed

2 files changed

+5
-28
lines changed

drivers/opp/core.c

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -176,27 +176,6 @@ unsigned long dev_pm_opp_get_power(struct dev_pm_opp *opp)
176176
}
177177
EXPORT_SYMBOL_GPL(dev_pm_opp_get_power);
178178

179-
/**
180-
* dev_pm_opp_get_freq() - Gets the frequency corresponding to an available opp
181-
* @opp: opp for which frequency has to be returned for
182-
*
183-
* Return: frequency in hertz corresponding to the opp, else
184-
* return 0
185-
*/
186-
unsigned long dev_pm_opp_get_freq(struct dev_pm_opp *opp)
187-
{
188-
if (IS_ERR_OR_NULL(opp)) {
189-
pr_err("%s: Invalid parameters\n", __func__);
190-
return 0;
191-
}
192-
193-
if (!assert_single_clk(opp->opp_table))
194-
return 0;
195-
196-
return opp->rates[0];
197-
}
198-
EXPORT_SYMBOL_GPL(dev_pm_opp_get_freq);
199-
200179
/**
201180
* dev_pm_opp_get_freq_indexed() - Gets the frequency corresponding to an
202181
* available opp with specified index

include/linux/pm_opp.h

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ int dev_pm_opp_get_supplies(struct dev_pm_opp *opp, struct dev_pm_opp_supply *su
103103

104104
unsigned long dev_pm_opp_get_power(struct dev_pm_opp *opp);
105105

106-
unsigned long dev_pm_opp_get_freq(struct dev_pm_opp *opp);
107-
108106
unsigned long dev_pm_opp_get_freq_indexed(struct dev_pm_opp *opp, u32 index);
109107

110108
unsigned int dev_pm_opp_get_level(struct dev_pm_opp *opp);
@@ -214,11 +212,6 @@ static inline unsigned long dev_pm_opp_get_power(struct dev_pm_opp *opp)
214212
return 0;
215213
}
216214

217-
static inline unsigned long dev_pm_opp_get_freq(struct dev_pm_opp *opp)
218-
{
219-
return 0;
220-
}
221-
222215
static inline unsigned long dev_pm_opp_get_freq_indexed(struct dev_pm_opp *opp, u32 index)
223216
{
224217
return 0;
@@ -669,4 +662,9 @@ static inline void dev_pm_opp_put_prop_name(int token)
669662
dev_pm_opp_clear_config(token);
670663
}
671664

665+
static inline unsigned long dev_pm_opp_get_freq(struct dev_pm_opp *opp)
666+
{
667+
return dev_pm_opp_get_freq_indexed(opp, 0);
668+
}
669+
672670
#endif /* __LINUX_OPP_H__ */

0 commit comments

Comments
 (0)