summaryrefslogtreecommitdiffstats
path: root/drivers/clk/uniphier/clk-uniphier-mux.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-12-12 20:44:25 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-12-12 20:44:25 +0100
commit2bf3b685a35c80fe368dad9da0e77ba48b460939 (patch)
tree3516a82ec33f96d5e9d3f36abef751aa0b788748 /drivers/clk/uniphier/clk-uniphier-mux.c
parentDocumentation: intel_pstate: Document HWP energy/performance hints (diff)
parentcpufreq: schedutil: Rectify comment in sugov_irq_work() function (diff)
downloadlinux-2bf3b685a35c80fe368dad9da0e77ba48b460939.tar.xz
linux-2bf3b685a35c80fe368dad9da0e77ba48b460939.zip
Merge schedutil governor updates for v4.10.
Diffstat (limited to 'drivers/clk/uniphier/clk-uniphier-mux.c')
-rw-r--r--drivers/clk/uniphier/clk-uniphier-mux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/uniphier/clk-uniphier-mux.c b/drivers/clk/uniphier/clk-uniphier-mux.c
index 15a2f2cbe0d9..2c243a894f3b 100644
--- a/drivers/clk/uniphier/clk-uniphier-mux.c
+++ b/drivers/clk/uniphier/clk-uniphier-mux.c
@@ -42,7 +42,7 @@ static u8 uniphier_clk_mux_get_parent(struct clk_hw *hw)
struct uniphier_clk_mux *mux = to_uniphier_clk_mux(hw);
int num_parents = clk_hw_get_num_parents(hw);
int ret;
- u32 val;
+ unsigned int val;
u8 i;
ret = regmap_read(mux->regmap, mux->reg, &val);