Merge branches 'pm-cpuidle', 'pm-devfreq' and 'pm-clk'
* pm-cpuidle: cpuidle/coupled: Remove redundant 'dev' argument of cpuidle_state_is_coupled() cpuidle/coupled: Remove cpuidle_device::safe_state_index intel_idle: Skylake Client Support intel_idle: allow idle states to be freeze-mode specific * pm-devfreq: PM / devfreq: exynos-ppmu: Update documentation to support PPMUv2 PM / devfreq: exynos-ppmu: Add the support of PPMUv2 for Exynos5433 PM / devfreq: event: Remove incorrect property in exynos-ppmu DT binding * pm-clk: PM / clk: don't return int on __pm_clk_enable()
Este commit está contenido en:
@@ -38,7 +38,7 @@ struct pm_clock_entry {
|
||||
* @dev: The device for the given clock
|
||||
* @ce: PM clock entry corresponding to the clock.
|
||||
*/
|
||||
static inline int __pm_clk_enable(struct device *dev, struct pm_clock_entry *ce)
|
||||
static inline void __pm_clk_enable(struct device *dev, struct pm_clock_entry *ce)
|
||||
{
|
||||
int ret;
|
||||
|
||||
@@ -50,8 +50,6 @@ static inline int __pm_clk_enable(struct device *dev, struct pm_clock_entry *ce)
|
||||
dev_err(dev, "%s: failed to enable clk %p, error %d\n",
|
||||
__func__, ce->clk, ret);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
|
Referencia en una nueva incidencia
Block a user