[PATCH 1/4] arm: omap: gpio: don't access irq_desc array directly

[Kevin Hilman]

Felipe Balbi <balbi at ti.com> writes:

> On Tue, Jan 04, 2011 at 04:24:58PM -0800, Kevin Hilman wrote:
>> Felipe Balbi <balbi at ti.com> writes:
>> 
>> > Instead of accessing the irq_desc array directly
>> > we can use irq_to_desc(irq). That will allow us to,
>> > if wanted, select SPARSE_IRQ and irq_descs will be
>> > added to a radix tree, instead of a array.
>> >
>> > Signed-off-by: Felipe Balbi <balbi at ti.com>
>> 
>> Can you refresh this one against Tony's omap-for-linus branch. The GPIO
>> omap_device/hwmod conversion changed things around a bit and this patch
>> doesn't apply.
>> 
>> After that, you can send separately, and I'll queue this one along with
>> some other GPIO core fixes for the 2.6.38-rc series after -rc1 comes
>> out.
>
> Sure, it's attached to this mail.

Thanks.  Queueing for 2.6.38-rc

Kevin

>
> From 8d216ccac14e4eebf259d5b40ed2d239248710e1 Mon Sep 17 00:00:00 2001
> From: Felipe Balbi <balbi at ti.com>
> Date: Wed, 5 Jan 2011 08:46:18 +0200
> Subject: [PATCH] arm: omap: gpio: don't access irq_desc array directly
> Organization: Texas Instruments\n
>
> Instead of accessing the irq_desc array directly
> we can use irq_to_desc(irq). That will allow us to,
> if wanted, select SPARSE_IRQ and irq_descs will be
> added to a radix tree, instead of a array.
>
> Signed-off-by: Felipe Balbi <balbi at ti.com>
> ---
>  arch/arm/plat-omap/gpio.c |   10 +++++++---
>  1 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
> index 1f98e0b..197a6c0 100644
> --- a/arch/arm/plat-omap/gpio.c
> +++ b/arch/arm/plat-omap/gpio.c
> @@ -756,8 +756,10 @@ static int gpio_irq_type(unsigned irq, unsigned type)
>  	spin_lock_irqsave(&bank->lock, flags);
>  	retval = _set_gpio_triggering(bank, get_gpio_index(gpio), type);
>  	if (retval == 0) {
> -		irq_desc[irq].status &= ~IRQ_TYPE_SENSE_MASK;
> -		irq_desc[irq].status |= type;
> +		struct irq_desc *d = irq_to_desc(irq);
> +
> +		d->status &= ~IRQ_TYPE_SENSE_MASK;
> +		d->status |= type;
>  	}
>  	spin_unlock_irqrestore(&bank->lock, flags);
>  
> @@ -1671,7 +1673,9 @@ static void __init omap_gpio_chip_init(struct gpio_bank *bank)
>  
>  	for (j = bank->virtual_irq_start;
>  		     j < bank->virtual_irq_start + bank_width; j++) {
> -		lockdep_set_class(&irq_desc[j].lock, &gpio_lock_class);
> +		struct irq_desc *d = irq_to_desc(j);
> +
> +		lockdep_set_class(&d->lock, &gpio_lock_class);
>  		set_irq_chip_data(j, bank);
>  		if (bank_is_mpuio(bank))
>  			set_irq_chip(j, &mpuio_irq_chip);