[PATCH 13/16] ARM: shmobile: remove use of gic_arch_extn.irq_set_wake

[Simon Horman]

On Tue, Dec 02, 2014 at 04:58:14PM +0000, Marc Zyngier wrote:
> shmobile only uses gic_arch_extn.irq_set_wake to prevent the GIC
> from returning -ENXIO when receiving a wake-up configuration request.
> 
> It is a lot simpler to tell the irq layer that we don't need any
> configuration by using the IRQCHIP_SKIP_SET_WAKE, thanks to the
> new gic_set_irqchip_flags function.
> 
> Signed-off-by: Marc Zyngier <marc.zyngier at arm.com>

Hi Marc,

this looks reasonable to me. Should I take it through my tree
(in v3.20) or did you have another path in mind?

> ---
>  arch/arm/mach-shmobile/intc-sh73a0.c   | 7 +------
>  arch/arm/mach-shmobile/setup-r8a7779.c | 7 +------
>  2 files changed, 2 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/arm/mach-shmobile/intc-sh73a0.c b/arch/arm/mach-shmobile/intc-sh73a0.c
> index 44457a9..b5af6ad 100644
> --- a/arch/arm/mach-shmobile/intc-sh73a0.c
> +++ b/arch/arm/mach-shmobile/intc-sh73a0.c
> @@ -256,11 +256,6 @@ static irqreturn_t sh73a0_intcs_demux(int irq, void *dev_id)
>  	return IRQ_HANDLED;
>  }
>  
> -static int sh73a0_set_wake(struct irq_data *data, unsigned int on)
> -{
> -	return 0; /* always allow wakeup */
> -}
> -
>  #define PINTER0_PHYS 0xe69000a0
>  #define PINTER1_PHYS 0xe69000a4
>  #define PINTER0_VIRT IOMEM(0xe69000a0)
> @@ -322,8 +317,8 @@ void __init sh73a0_init_irq(void)
>  	void __iomem *gic_cpu_base = IOMEM(0xf0000100);
>  	void __iomem *intevtsa = ioremap_nocache(0xffd20100, PAGE_SIZE);
>  
> +	gic_set_irqchip_flags(IRQCHIP_SKIP_SET_WAKE);
>  	gic_init(0, 29, gic_dist_base, gic_cpu_base);
> -	gic_arch_extn.irq_set_wake = sh73a0_set_wake;
>  
>  	register_intc_controller(&intcs_desc);
>  	register_intc_controller(&intc_pint0_desc);
> diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
> index 136078a..8cde457 100644
> --- a/arch/arm/mach-shmobile/setup-r8a7779.c
> +++ b/arch/arm/mach-shmobile/setup-r8a7779.c
> @@ -716,14 +716,9 @@ void __init r8a7779_init_late(void)
>  }
>  
>  #ifdef CONFIG_USE_OF
> -static int r8a7779_set_wake(struct irq_data *data, unsigned int on)
> -{
> -	return 0; /* always allow wakeup */
> -}
> -
>  void __init r8a7779_init_irq_dt(void)
>  {
> -	gic_arch_extn.irq_set_wake = r8a7779_set_wake;
> +	gic_set_irqchip_flags(IRQCHIP_SKIP_SET_WAKE);
>  
>  	irqchip_init();
>  
> -- 
> 2.1.3
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>