lkml.org 
[lkml]   [2019]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6/7] powerpc/setup: cleanup the #ifdef CONFIG_TAU block
    Date
    Use cpu_has_feature() instead of opencoding

    Use IS_ENABLED() instead of #ifdef for CONFIG_TAU_AVERAGE

    Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
    ---
    arch/powerpc/kernel/setup-common.c | 24 ++++++++++++------------
    1 file changed, 12 insertions(+), 12 deletions(-)

    diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
    index 95d545e94c28..b6c86287085a 100644
    --- a/arch/powerpc/kernel/setup-common.c
    +++ b/arch/powerpc/kernel/setup-common.c
    @@ -254,18 +254,18 @@ static int show_cpuinfo(struct seq_file *m, void *v)
    seq_printf(m, "\n");

    #ifdef CONFIG_TAU
    - if (cur_cpu_spec->cpu_features & CPU_FTR_TAU) {
    -#ifdef CONFIG_TAU_AVERAGE
    - /* more straightforward, but potentially misleading */
    - seq_printf(m, "temperature \t: %u C (uncalibrated)\n",
    - cpu_temp(cpu_id));
    -#else
    - /* show the actual temp sensor range */
    - u32 temp;
    - temp = cpu_temp_both(cpu_id);
    - seq_printf(m, "temperature \t: %u-%u C (uncalibrated)\n",
    - temp & 0xff, temp >> 16);
    -#endif
    + if (cpu_has_feature(CPU_FTR_TAU)) {
    + if (IS_ENABLED(CONFIG_TAU_AVERAGE)) {
    + /* more straightforward, but potentially misleading */
    + seq_printf(m, "temperature \t: %u C (uncalibrated)\n",
    + cpu_temp(cpu_id));
    + } else {
    + /* show the actual temp sensor range */
    + u32 temp;
    + temp = cpu_temp_both(cpu_id);
    + seq_printf(m, "temperature \t: %u-%u C (uncalibrated)\n",
    + temp & 0xff, temp >> 16);
    + }
    }
    #endif /* CONFIG_TAU */

    --
    2.13.3
    \
     
     \ /
      Last update: 2019-03-22 09:09    [W:2.601 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site