[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CACxGe6ujBaRLxo9JSW-vMHz1TZs+poKacHQbvC=aAjUsSq=m4g@mail.gmail.com>
Date: Wed, 14 Dec 2011 14:16:09 -0700
From: Grant Likely <grant.likely@...retlab.ca>
To: Rob Herring <robherring2@...il.com>
Cc: linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
devicetree-discuss@...ts.ozlabs.org, shawn.guo@...escale.com,
Kukjin Kim <kgene.kim@...sung.com>,
Kevin Hilman <khilman@...com>,
Tony Lindgren <tony@...mide.com>,
Barry Song <baohua.song@....com>,
Linus Walleij <linus.ml.walleij@...il.com>,
Rob Herring <rob.herring@...xeda.com>
Subject: Re: [PATCH 5/9] gpio: pl061: convert to use 0 for no irq
On Wed, Dec 14, 2011 at 8:28 AM, Rob Herring <robherring2@...il.com> wrote:
> From: Rob Herring <rob.herring@...xeda.com>
>
> 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@...xeda.com>
> Cc: Grant Likely <grant.likely@...retlab.ca>
Acked-by: Grant Likely <grant.likely@...retlab.ca>
> Cc: Linus Walleij <linus.ml.walleij@...il.com>
> ---
> drivers/gpio/gpio-pl061.c | 8 ++++----
> include/linux/amba/pl061.h | 2 +-
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c
> index 0f718f9..fe19dec 100644
> --- a/drivers/gpio/gpio-pl061.c
> +++ b/drivers/gpio/gpio-pl061.c
> @@ -53,7 +53,7 @@ struct pl061_gpio {
> spinlock_t irq_lock; /* IRQ registers */
>
> void __iomem *base;
> - unsigned irq_base;
> + int irq_base;
> 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);
>
> - if (chip->irq_base == NO_IRQ)
> + if (chip->irq_base <= 0)
> return -EINVAL;
>
> 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;
> } else if (dev->dev.of_node) {
> chip->gc.base = -1;
> - chip->irq_base = NO_IRQ;
> + chip->irq_base = 0;
> } else {
> ret = -ENODEV;
> goto free_mem;
> @@ -290,7 +290,7 @@ static int pl061_probe(struct amba_device *dev, const struct amba_id *id)
> * irq_chip support
> */
>
> - if (chip->irq_base == NO_IRQ)
> + if (chip->irq_base <= 0)
> return 0;
>
> writeb(0, chip->base + GPIOIE); /* disable irqs */
> diff --git a/include/linux/amba/pl061.h b/include/linux/amba/pl061.h
> index 2412af9..fb83c04 100644
> --- a/include/linux/amba/pl061.h
> +++ b/include/linux/amba/pl061.h
> @@ -7,7 +7,7 @@ struct pl061_platform_data {
> unsigned gpio_base;
>
> /* 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;
>
> --
> 1.7.5.4
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists