diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-11-04 10:01:20 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-11-04 10:01:20 -0800 |
| commit | 49bd04cb11e57c4cd4d2c00feca898537dd6db1f (patch) | |
| tree | 846c594b2b1d2f203c24ff32569b6c615822a5dc /drivers/base/power/clock_ops.c | |
| parent | 260409578ecbf7ce1725b85f9c082312bff808c0 (diff) | |
| parent | 12ba397b828b7e7f5d28a73e9a2ee14470b7edc7 (diff) | |
Merge tag 'v4.1.12-rt12' of git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel into v4.1/topic/rtv4.1/topic/rt
v4.1.12-rt12
Diffstat (limited to 'drivers/base/power/clock_ops.c')
| -rw-r--r-- | drivers/base/power/clock_ops.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c index c7b0fcebf168..ac3c07db92f1 100644 --- a/drivers/base/power/clock_ops.c +++ b/drivers/base/power/clock_ops.c @@ -37,7 +37,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; @@ -49,8 +49,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; } /** |