Commit a065685d authored by Linus Walleij's avatar Linus Walleij Committed by Eric Miao
Browse files

ARM: pxa: fix gpio_to_chip() clash with gpiolib namespace 



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: default avatarH Hartley Sweeten <hartleys@visionengravers.com>
Cc: Eric Miao <eric.miao@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 6662498e

arch/arm/plat-pxa/gpio.c

+5 −5
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE