diff options
| author | Rafael J. Wysocki | 2018-06-29 09:54:20 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki | 2018-06-29 09:54:20 +0200 |
| commit | e27b4d4a7b987ffa93a5a1249dd83dcb69f8d040 (patch) | |
| tree | 73f7df438c563de03a576705fe2dd8a3dcecd35b /include | |
| parent | 649f53a3e4cf6873741673b9271275e484c56194 (diff) | |
| parent | ad6384ba3ac98ad524194e37de379c1fe503870b (diff) | |
Merge branch 'pm-domains'
Merge fixups for the recent extenstion of the generic power domains
(genpd) framework covering performance states.
* pm-domains:
PM / Domains: Rename opp_node to np
PM / Domains: Fix return value of of_genpd_opp_to_performance_state()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pm_domain.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 9206a4fef9ac..cb8d84090cfb 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -234,7 +234,7 @@ struct generic_pm_domain *of_genpd_remove_last(struct device_node *np); int of_genpd_parse_idle_states(struct device_node *dn, struct genpd_power_state **states, int *n); unsigned int of_genpd_opp_to_performance_state(struct device *dev, - struct device_node *opp_node); + struct device_node *np); int genpd_dev_pm_attach(struct device *dev); struct device *genpd_dev_pm_attach_by_id(struct device *dev, @@ -274,9 +274,9 @@ static inline int of_genpd_parse_idle_states(struct device_node *dn, static inline unsigned int of_genpd_opp_to_performance_state(struct device *dev, - struct device_node *opp_node) + struct device_node *np) { - return -ENODEV; + return 0; } static inline int genpd_dev_pm_attach(struct device *dev) |