Skip to content

Commit 838a477

Browse files
committed
cpufreq: Move dev_pm_opp_{init|free}_cpufreq_table() to pm_opp.h
Move the declaration of functions defined in the OPP core to pm_opp.h. These were added to cpufreq.h as it was the only user of the APIs, but that was a mistake perhaps. Fix it. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
1 parent abb3f97 commit 838a477

File tree

2 files changed

+16
-20
lines changed

2 files changed

+16
-20
lines changed

include/linux/cpufreq.h

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -694,26 +694,6 @@ struct cpufreq_frequency_table {
694694
* order */
695695
};
696696

697-
#if defined(CONFIG_CPU_FREQ) && defined(CONFIG_PM_OPP)
698-
int dev_pm_opp_init_cpufreq_table(struct device *dev,
699-
struct cpufreq_frequency_table **table);
700-
void dev_pm_opp_free_cpufreq_table(struct device *dev,
701-
struct cpufreq_frequency_table **table);
702-
#else
703-
static inline int dev_pm_opp_init_cpufreq_table(struct device *dev,
704-
struct cpufreq_frequency_table
705-
**table)
706-
{
707-
return -EINVAL;
708-
}
709-
710-
static inline void dev_pm_opp_free_cpufreq_table(struct device *dev,
711-
struct cpufreq_frequency_table
712-
**table)
713-
{
714-
}
715-
#endif
716-
717697
/*
718698
* cpufreq_for_each_entry - iterate over a cpufreq_frequency_table
719699
* @pos: the cpufreq_frequency_table * to use as a loop cursor.

include/linux/pm_opp.h

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <linux/notifier.h>
1717

1818
struct clk;
19+
struct cpufreq_frequency_table;
1920
struct regulator;
2021
struct dev_pm_opp;
2122
struct device;
@@ -446,6 +447,21 @@ static inline int dev_pm_opp_sync_regulators(struct device *dev)
446447

447448
#endif /* CONFIG_PM_OPP */
448449

450+
#if defined(CONFIG_CPU_FREQ) && defined(CONFIG_PM_OPP)
451+
int dev_pm_opp_init_cpufreq_table(struct device *dev, struct cpufreq_frequency_table **table);
452+
void dev_pm_opp_free_cpufreq_table(struct device *dev, struct cpufreq_frequency_table **table);
453+
#else
454+
static inline int dev_pm_opp_init_cpufreq_table(struct device *dev, struct cpufreq_frequency_table **table)
455+
{
456+
return -EINVAL;
457+
}
458+
459+
static inline void dev_pm_opp_free_cpufreq_table(struct device *dev, struct cpufreq_frequency_table **table)
460+
{
461+
}
462+
#endif
463+
464+
449465
#if defined(CONFIG_PM_OPP) && defined(CONFIG_OF)
450466
int dev_pm_opp_of_add_table(struct device *dev);
451467
int dev_pm_opp_of_add_table_indexed(struct device *dev, int index);

0 commit comments

Comments
 (0)