Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 642aa8ce authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

PM / OPP: dev_pm_opp_set_sharing_cpus() doesn't depend on CONFIG_OF 



dev_pm_opp_set_sharing_cpus() doesn't do any DT specific stuff and its
declarations are added within the CONFIG_OF ifdef by mistake. Take them
out of that.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 45ca36ad

include/linux/pm_opp.h

+6 −6
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ void dev_pm_opp_put_prop_name(struct device *dev); 
int dev_pm_opp_set_regulator(struct device *dev, const char *name);

void dev_pm_opp_put_regulator(struct device *dev);

int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq);

int dev_pm_opp_set_sharing_cpus(struct device *cpu_dev, cpumask_var_t cpumask);

#else

static inline unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp)

{
@@ -178,6 +179,11 @@ static inline int dev_pm_opp_set_rate(struct device *dev, unsigned long target_f 
	return -EINVAL;

}



static inline int dev_pm_opp_set_sharing_cpus(struct device *cpu_dev, cpumask_var_t cpumask)

{

	return -ENOSYS;

}



#endif		/* CONFIG_PM_OPP */



#if defined(CONFIG_PM_OPP) && defined(CONFIG_OF)
@@ -186,7 +192,6 @@ void dev_pm_opp_of_remove_table(struct device *dev); 
int dev_pm_opp_of_cpumask_add_table(cpumask_var_t cpumask);

void dev_pm_opp_of_cpumask_remove_table(cpumask_var_t cpumask);

int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, cpumask_var_t cpumask);

int dev_pm_opp_set_sharing_cpus(struct device *cpu_dev, cpumask_var_t cpumask);

#else

static inline int dev_pm_opp_of_add_table(struct device *dev)

{
@@ -210,11 +215,6 @@ static inline int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, cpumask 
{

	return -ENOSYS;

}



static inline int dev_pm_opp_set_sharing_cpus(struct device *cpu_dev, cpumask_var_t cpumask)

{

	return -ENOSYS;

}

#endif



#endif		/* __LINUX_OPP_H__ */