evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gpio: pl061: convert to use 0 for no irq

Browse source 
We don't want drivers using NO_IRQ, so remove its use. For now, 0 or
-1 means no irq until platforms are converted to use 0.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Linus Walleij <linus.ml.walleij@gmail.com>
This commit is contained in:
Rob Herring 2011-12-09 14:11:41 -06:00
parent dece904d74
commit f2ab2ba09e
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/gpio/gpio-pl061.c
View file

@ -53,7 +53,7 @@ struct pl061_gpio {
spinlock_t irq_lock; /* IRQ registers */ spinlock_t irq_lock; /* IRQ registers */
void __iomem *base; void __iomem *base;
unsigned irq_base; int irq_base;
struct gpio_chip gc; struct gpio_chip gc;
}; };
@ -119,7 +119,7 @@ static int pl061_to_irq(struct gpio_chip *gc, unsigned offset)
{ {
struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc); struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc);
if (chip->irq_base == NO_IRQ) if (chip->irq_base <= 0)
return -EINVAL; return -EINVAL;
return chip->irq_base + offset; return chip->irq_base + offset;
@ -250,7 +250,7 @@ static int pl061_probe(struct amba_device *dev, const struct amba_id *id)
chip->irq_base = pdata->irq_base; chip->irq_base = pdata->irq_base;
} else if (dev->dev.of_node) { } else if (dev->dev.of_node) {
chip->gc.base = -1; chip->gc.base = -1;
chip->irq_base = NO_IRQ; chip->irq_base = 0;
} else { } else {
ret = -ENODEV; ret = -ENODEV;
goto free_mem; goto free_mem;
@ -290,7 +290,7 @@ static int pl061_probe(struct amba_device *dev, const struct amba_id *id)
* irq_chip support * irq_chip support
*/ */
if (chip->irq_base == NO_IRQ) if (chip->irq_base <= 0)
return 0; return 0;
writeb(0, chip->base + GPIOIE); /* disable irqs */ writeb(0, chip->base + GPIOIE); /* disable irqs */

2
include/linux/amba/pl061.h
View file

@ -7,7 +7,7 @@ struct pl061_platform_data {
unsigned gpio_base; unsigned gpio_base;
/* number of the first IRQ. /* number of the first IRQ.
* If the IRQ functionality in not desired this must be set to NO_IRQ. * If the IRQ functionality in not desired this must be set to 0.
*/ */
unsigned irq_base; unsigned irq_base;