Re: [PATCH 4/5] Move gcmp_probe to before the SMP ops

[Ralf Baechle <ralf@linux-mips.org>]

On Tue, Jun 16, 2009 at 05:00:35PM -0700, Tim Anderson wrote:

> @@ -358,10 +361,16 @@ void __init prom_init(void)
>  #ifdef CONFIG_SERIAL_8250_CONSOLE
>       console_config();
>  #endif
> +     /* Early detection of CMP support */
> +     result = gcmp_probe(GCMP_BASE_ADDR, GCMP_ADDRSPACE_SZ);
> +
>  #ifdef CONFIG_MIPS_CMP
> -     register_smp_ops(&cmp_smp_ops);
> +     if (result) register_smp_ops(&cmp_smp_ops);

Keep the register_smp_ops on a separate line.

>  #endif
>  #ifdef CONFIG_MIPS_MT_SMP
> +#ifdef CONFIG_MIPS_CMP
> +     if (!result)
> +#endif
>       register_smp_ops(&vsmp_smp_ops);

Suggested rewrite for readability and to silence checkpatch:

#ifdef CONFIG_MIPS_CMP
        if (!result)
                register_smp_ops(&vsmp_smp_ops);
#else
        register_smp_ops(&vsmp_smp_ops);
#endif

  Ralf