Re: [PATCH] x86/ioapic: Fix style in io_apic.h

[Jan Beulich <jbeulich@xxxxxxxx>]

On 05.08.2020 14:51, Andrew Cooper wrote:
> This file is a mix of Xen and Linux styles.  Switch it fully to Xen style.
> 
> No functional change.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>

Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
with a suggestion and, I'm afraid, a few more adjustments:

> --- a/xen/include/asm-x86/io_apic.h
> +++ b/xen/include/asm-x86/io_apic.h
> @@ -13,9 +13,9 @@
>   * Copyright (C) 1997, 1998, 1999, 2000 Ingo Molnar
>   */
>  
> -#define IO_APIC_BASE(idx) \
> -             ((volatile int *)(__fix_to_virt(FIX_IO_APIC_BASE_0 + idx) \
> -             + (mp_ioapics[idx].mpc_apicaddr & ~PAGE_MASK)))
> +#define IO_APIC_BASE(idx)                                               \
> +    ((volatile int *)(__fix_to_virt(FIX_IO_APIC_BASE_0 + idx)           \
> +                      + (mp_ioapics[idx].mpc_apicaddr & ~PAGE_MASK)))

As you touch this anyway, would you mind parenthesizing idx when
used as a, operand of + ?

> @@ -135,28 +135,28 @@ unsigned int io_apic_gsi_base(unsigned int apic);
>  
>  static inline unsigned int __io_apic_read(unsigned int apic, unsigned int 
> reg)
>  {
> -     *IO_APIC_BASE(apic) = reg;
> -     return *(IO_APIC_BASE(apic)+4);
> +    *IO_APIC_BASE(apic) = reg;
> +    return *(IO_APIC_BASE(apic)+4);

Here and below + wants to be framed by spaces.

Jan