Re: [Linaro-acpi] [PATCH v14 3/9] clocksource/drivers/arm_arch_timer: Improve printk relevant code

Hi Mark,

On 20 October 2016 at 23:32, Mark Rutland mark.rutland@arm.com wrote:

On Thu, Sep 29, 2016 at 02:17:11AM +0800, fu.wei@linaro.org wrote:

...

static void arch_timer_banner(unsigned type) {

• pr_info("Architected %s%s%s timer(s) running at %lu.%02luMHz (%s%s%s).\n",
  

•              type & ARCH_CP15_TIMER ? "cp15" : "",
  

•              type == (ARCH_CP15_TIMER | ARCH_MEM_TIMER) ?  " and " : "",
  

•              type & ARCH_MEM_TIMER ? "mmio" : "",
  

•              (unsigned long)arch_timer_rate / 1000000,
  

•              (unsigned long)(arch_timer_rate / 10000) % 100,
  

•              type & ARCH_CP15_TIMER ?
  

•              (arch_timer_uses_ppi == VIRT_PPI) ? "virt" : "phys" :
  

•                 "",
  

•              type == (ARCH_CP15_TIMER | ARCH_MEM_TIMER) ?  "/" : "",
  

•              type & ARCH_MEM_TIMER ?
  

•                 arch_timer_mem_use_virtual ? "virt" : "phys" :
  

•                 "");
  

• pr_info("%s%s%s timer(s) running at %lu.%02luMHz (%s%s%s).\n",
  

•         type & ARCH_CP15_TIMER ? "cp15" : "",
  

•         type == (ARCH_CP15_TIMER | ARCH_MEM_TIMER) ?  " and " : "",
  

•         type & ARCH_MEM_TIMER ? "mmio" : "",
  

•         (unsigned long)arch_timer_rate / 1000000,
  

•         (unsigned long)(arch_timer_rate / 10000) % 100,
  

•         type & ARCH_CP15_TIMER ?
  

•         (arch_timer_uses_ppi == VIRT_PPI) ? "virt" : "phys" :
  

•         "",
  

Please restore the additional indent on this line...

...

•         type == (ARCH_CP15_TIMER | ARCH_MEM_TIMER) ?  "/" : "",
  

•         type & ARCH_MEM_TIMER ?
  

•         arch_timer_mem_use_virtual ? "virt" : "phys" :
  

•         "");
  

... and these two.

No matter what checkpatch says, I prefer the code that way so as to keep the ternary clear.

yes, NP, I have fixed it :-)

[...]

...

@@ -768,7 +769,7 @@ static int __init arch_timer_init(void) return ret;

  arch_timer_kvm_info.virtual_irq = arch_timer_ppi[VIRT_PPI];

Please mention the whitespace fixup in the commit message. It's surprising otherwise.

OK, added this message.

With all that:

Acked-by: Mark Rutland mark.rutland@arm.com

Great thanks :-)

Thanks, Mark.