[PATCH v7 04/11] ARM: pxa: rename gpio_to_irq and irq_to_gpio

[Russell King - ARM Linux]

On Mon, Nov 14, 2011 at 06:28:23PM +0800, Haojian Zhuang wrote:
> On Mon, Nov 14, 2011 at 6:09 PM, Russell King - ARM Linux
> <linux at arm.linux.org.uk> wrote:
> > On Wed, Nov 09, 2011 at 10:47:24AM +0800, Haojian Zhuang wrote:
> >> diff --git a/arch/arm/mach-pxa/cm-x2xx-pci.c b/arch/arm/mach-pxa/cm-x2xx-pci.c
> >> index ebd9259..e79e081 100644
> >> --- a/arch/arm/mach-pxa/cm-x2xx-pci.c
> >> +++ b/arch/arm/mach-pxa/cm-x2xx-pci.c
> >> @@ -43,9 +43,9 @@ void __cmx2xx_pci_init_irq(int irq_gpio)
> >>
> >>       cmx2xx_it8152_irq_gpio = irq_gpio;
> >>
> >> -     irq_set_irq_type(gpio_to_irq(irq_gpio), IRQ_TYPE_EDGE_RISING);
> >> +     irq_set_irq_type(PXA_GPIO_TO_IRQ(irq_gpio), IRQ_TYPE_EDGE_RISING);
> >>
> >> -     irq_set_chained_handler(gpio_to_irq(irq_gpio),
> >> +     irq_set_chained_handler(PXA_GPIO_TO_IRQ(irq_gpio),
> >>                               cmx2xx_it8152_irq_demux);
> >
> > The only comment remaining from the previous review of these patches is
> > that these changes to the runtime usage of gpio_to_irq() should not be
> > necessary.
> >
> > If gpiolib is implemented correctly, when running on PXA,
> > PXA_GPIO_TO_IRQ(gpio) should be the same as gpio_to_irq(gpio).
> >
> 
> Yes, it seems that this patch is unnecessary. So will you merge rest
> of those gpio patches into your git tree?

Some of this patch is required - all the places where gpio_to_irq() is
used as an initializer need to be fixed.  Those places where it is used
at run-time should not be fixed up though.