Re: [patch 09/12] xtensa: allow platform and variant to initializeown irq chips

[Chris Zankel]

Hi Daniel,

What
Johannes Weiner wrote:
> From: Daniel GlÃckner <dg@xxxxxxxxx>
>
> diff --git a/arch/xtensa/include/asm/irq.h b/arch/xtensa/include/asm/irq.h
> index dfac82d..c3c10a7 100644
> --- a/arch/xtensa/include/asm/irq.h
> +++ b/arch/xtensa/include/asm/irq.h
> @@ -11,21 +11,36 @@
>  #ifndef _XTENSA_IRQ_H
>  #define _XTENSA_IRQ_H
>  
> +#include <linux/init.h>
>  #include <platform/hardware.h>
>  #include <variant/core.h>
>  
> -#ifdef CONFIG_VARIANT_IRQ_SWITCH
>  #include <variant/irq.h>
> -#else
> +#ifndef CONFIG_VARIANT_IRQ_SWITCH
>  static inline void variant_irq_enable(unsigned int irq) { }
>  static inline void variant_irq_disable(unsigned int irq) { }
>  #endif

What was the reason for this change? We shouldn't require all processor 
variants to provide an irq.h header file, unless required (and we 
wouldn't need to add the following files)

> diff --git a/arch/xtensa/variants/dc232b/include/variant/irq.h b/arch/xtensa/variants/dc232b/include/variant/irq.h
> new file mode 100644
> index 0000000..070b9f5
> --- /dev/null
> +++ b/arch/xtensa/variants/dc232b/include/variant/irq.h
> @@ -0,0 +1,4 @@
> +#ifndef __XTENSA_VARIANT_IRQ_H
> +#define __XTENSA_VARIANT_IRQ_H
> +
> +#endif
> diff --git a/arch/xtensa/variants/fsf/include/variant/irq.h b/arch/xtensa/variants/fsf/include/variant/irq.h
> new file mode 100644
> index 0000000..070b9f5
> --- /dev/null
> +++ b/arch/xtensa/variants/fsf/include/variant/irq.h
> @@ -0,0 +1,4 @@
> +#ifndef __XTENSA_VARIANT_IRQ_H
> +#define __XTENSA_VARIANT_IRQ_H
> +
> +#endif

Since you are at it, can you change __XTENSA_S6000_IRQ_H to 
_XTENSA_S6000_IRQ_H (single 'underscore' prefix).

> diff --git a/arch/xtensa/variants/s6000/include/variant/irq.h b/arch/xtensa/variants/s6000/include/variant/irq.h
> index fa031cb..55403d1 100644
> --- a/arch/xtensa/variants/s6000/include/variant/irq.h
> +++ b/arch/xtensa/variants/s6000/include/variant/irq.h
> @@ -2,6 +2,7 @@
>  #define __XTENSA_S6000_IRQ_H
>  
>  #define NO_IRQ		(-1)
> +#define VARIANT_NR_IRQS 8 /* GPIO interrupts */
>  
>  extern void variant_irq_enable(unsigned int irq);
>  extern void variant_irq_disable(unsigned int irq);

Thanks,
-Chris
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/