diff options
| author | Swetha Chikkaboraiah <schikk@codeaurora.org> | 2020-03-02 10:55:12 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2020-05-21 23:57:59 -0700 |
| commit | 6dbab77b6ddda309f56027f135f1eede33b76c2c (patch) | |
| tree | 1d6202db5896c0cd90b44962678ebfafec402362 /drivers/clk/qcom/clk-debug.c | |
| parent | 5a6566f225652a01f17f062b4fa91f269e49014a (diff) | |
kernel: Fix build errors with LLVM
This patch intends to fix compilation errors
while building kernel with LLVM toolchain.
Change-Id: I76c4f97d8a0efb44434d54fb07cae23b050d2003
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>
Diffstat (limited to 'drivers/clk/qcom/clk-debug.c')
| -rw-r--r-- | drivers/clk/qcom/clk-debug.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/clk/qcom/clk-debug.c b/drivers/clk/qcom/clk-debug.c index 50d0d01188ed..496b80eace5b 100644 --- a/drivers/clk/qcom/clk-debug.c +++ b/drivers/clk/qcom/clk-debug.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014, 2016-2017, + * Copyright (c) 2013-2014, 2016-2017, 2020, * * The Linux Foundation. All rights reserved. * @@ -177,13 +177,12 @@ static int clk_debug_mux_set_parent(struct clk_hw *hw, u8 index) regval |= (meas->parent[index].next_sel & meas->mask); - if (meas->parent[index].en_mask == 0xFF) - /* Skip en_mask */ - regval = regval; - else if (meas->parent[index].en_mask) - regval |= meas->parent[index].en_mask; - else - regval |= meas->en_mask; + if (meas->parent[index].en_mask != 0xFF) { + if (meas->parent[index].en_mask) + regval |= meas->parent[index].en_mask; + else + regval |= meas->en_mask; + } regmap_write(meas->regmap[dbg_cc], 0x0, regval); } |