[PATCH] gpio/plat-pxa: fix clash with gpiolib namespace

[Grant Likely]

On Mon, Jun 13, 2011 at 05:03:50PM +0800, Eric Miao wrote:
> On Mon, Jun 13, 2011 at 4:42 PM, Linus Walleij
> <linus.walleij at stericsson.com> wrote:
> > From: Linus Walleij <linus.walleij at linaro.org>
> >
> > The PXA platform code has a static inline helper called
> > gpio_to_chip which clashes with the gpiolib namespace if we
> > try to expose the function with the same name from gpiolib,
> > and it's still confusing even if we don't do that. So rename
> > it to gpio_to_pxachip().
> >
> > Reported-by: H Hartley Sweeten <hartleys at visionengravers.com>
> > Cc: Eric Miao <eric.miao at linaro.org>
> > Signed-off-by: Linus Walleij <linus.walleij at linaro.org>
> 
> OK, applied to 'devel'.

Is the pxa gpio driver going to be moved to drivers/gpio this cycle?
If so, you'll probably want to keep the gpio changes in a separate
branch that can be merged both into gpio/next and your devel branch,
just in case there ends up being merge issues between our branches in
linux-next.

g.

> 
> > ---
> >  arch/arm/plat-pxa/gpio.c |   10 +++++-----
> >  1 files changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/arch/arm/plat-pxa/gpio.c b/arch/arm/plat-pxa/gpio.c
> > index 48ebb94..a11dc36 100644
> > --- a/arch/arm/plat-pxa/gpio.c
> > +++ b/arch/arm/plat-pxa/gpio.c
> > @@ -50,7 +50,7 @@ static inline void __iomem *gpio_chip_base(struct gpio_chip *c)
> >        return container_of(c, struct pxa_gpio_chip, chip)->regbase;
> >  }
> >
> > -static inline struct pxa_gpio_chip *gpio_to_chip(unsigned gpio)
> > +static inline struct pxa_gpio_chip *gpio_to_pxachip(unsigned gpio)
> >  {
> >        return &pxa_gpio_chips[gpio_to_bank(gpio)];
> >  }
> > @@ -161,7 +161,7 @@ static int pxa_gpio_irq_type(struct irq_data *d, unsigned int type)
> >        int gpio = irq_to_gpio(d->irq);
> >        unsigned long gpdr, mask = GPIO_bit(gpio);
> >
> > -       c = gpio_to_chip(gpio);
> > +       c = gpio_to_pxachip(gpio);
> >
> >        if (type == IRQ_TYPE_PROBE) {
> >                /* Don't mess with enabled GPIOs using preconfigured edges or
> > @@ -230,7 +230,7 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc)
> >  static void pxa_ack_muxed_gpio(struct irq_data *d)
> >  {
> >        int gpio = irq_to_gpio(d->irq);
> > -       struct pxa_gpio_chip *c = gpio_to_chip(gpio);
> > +       struct pxa_gpio_chip *c = gpio_to_pxachip(gpio);
> >
> >        __raw_writel(GPIO_bit(gpio), c->regbase + GEDR_OFFSET);
> >  }
> > @@ -238,7 +238,7 @@ static void pxa_ack_muxed_gpio(struct irq_data *d)
> >  static void pxa_mask_muxed_gpio(struct irq_data *d)
> >  {
> >        int gpio = irq_to_gpio(d->irq);
> > -       struct pxa_gpio_chip *c = gpio_to_chip(gpio);
> > +       struct pxa_gpio_chip *c = gpio_to_pxachip(gpio);
> >        uint32_t grer, gfer;
> >
> >        c->irq_mask &= ~GPIO_bit(gpio);
> > @@ -252,7 +252,7 @@ static void pxa_mask_muxed_gpio(struct irq_data *d)
> >  static void pxa_unmask_muxed_gpio(struct irq_data *d)
> >  {
> >        int gpio = irq_to_gpio(d->irq);
> > -       struct pxa_gpio_chip *c = gpio_to_chip(gpio);
> > +       struct pxa_gpio_chip *c = gpio_to_pxachip(gpio);
> >
> >        c->irq_mask |= GPIO_bit(gpio);
> >        update_edge_detect(c);
> > --
> > 1.7.3.2
> >
> >
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel at lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> >