From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Hilman Subject: Re: [PATCH 1/4] arm: omap: gpio: don't access irq_desc array directly Date: Tue, 04 Jan 2011 16:24:58 -0800 Message-ID: <87r5cs42p1.fsf@ti.com> References: <1294142577-28772-1-git-send-email-balbi@ti.com> <1294142577-28772-2-git-send-email-balbi@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from na3sys009aog114.obsmtp.com ([74.125.149.211]:45038 "EHLO na3sys009aog114.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751078Ab1AEAZF (ORCPT ); Tue, 4 Jan 2011 19:25:05 -0500 Received: by mail-gx0-f182.google.com with SMTP id 8so6338317gxk.27 for ; Tue, 04 Jan 2011 16:25:03 -0800 (PST) In-Reply-To: <1294142577-28772-2-git-send-email-balbi@ti.com> (Felipe Balbi's message of "Tue, 4 Jan 2011 14:02:54 +0200") Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Felipe Balbi Cc: Tony Lindgren , Linux OMAP Mailing List , Linux ARM Kernel Mailing List , Russell King Felipe Balbi 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 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. Kevin > --- > 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 c05c653..c351758 100644 > --- a/arch/arm/plat-omap/gpio.c > +++ b/arch/arm/plat-omap/gpio.c > @@ -905,8 +905,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); > > @@ -1925,7 +1927,9 @@ static int __init _omap_gpio_init(void) > > for (j = bank->virtual_irq_start; > j < bank->virtual_irq_start + gpio_count; 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);