From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753737Ab1FMPDN (ORCPT ); Mon, 13 Jun 2011 11:03:13 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:62422 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752604Ab1FMPDK (ORCPT ); Mon, 13 Jun 2011 11:03:10 -0400 Date: Mon, 13 Jun 2011 09:03:08 -0600 From: Grant Likely To: Linus Walleij Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Lee Jones , Linus Walleij , Eric Miao Subject: Re: [PATCH] gpio/plat-pxa: fix clash with gpiolib namespace Message-ID: <20110613150308.GB18161@ponder.secretlab.ca> References: <1307954539-5681-1-git-send-email-linus.walleij@stericsson.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1307954539-5681-1-git-send-email-linus.walleij@stericsson.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jun 13, 2011 at 10:42:19AM +0200, Linus Walleij wrote: > From: Linus Walleij > > 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 > Cc: Eric Miao > Signed-off-by: Linus Walleij Acked-by: Grant Likely > --- > 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 >