From: Baruch Siach <baruch@tkos.co.il>
To: Lennert Buytenhek <buytenh@wantstofly.org>
Cc: David Brownell <david-b@pacbell.net>,
Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 05/10] gpio: pl061: irq_data conversion.
Date: Mon, 13 Dec 2010 14:48:56 +0200 [thread overview]
Message-ID: <20101213124856.GE5766@jasper.tkos.co.il> (raw)
In-Reply-To: <20101213120256.GD15575@mail.wantstofly.org>
Hi Lennert,
(Added LAKL to Cc).
On Mon, Dec 13, 2010 at 01:02:56PM +0100, Lennert Buytenhek wrote:
> Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Baruch Siach <baruch@tkos.co.il>
> ---
> drivers/gpio/pl061.c | 28 ++++++++++++++--------------
> 1 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/gpio/pl061.c b/drivers/gpio/pl061.c
> index 5005990..2975d22 100644
> --- a/drivers/gpio/pl061.c
> +++ b/drivers/gpio/pl061.c
> @@ -129,10 +129,10 @@ static int pl061_to_irq(struct gpio_chip *gc, unsigned offset)
> /*
> * PL061 GPIO IRQ
> */
> -static void pl061_irq_disable(unsigned irq)
> +static void pl061_irq_disable(struct irq_data *d)
> {
> - struct pl061_gpio *chip = get_irq_chip_data(irq);
> - int offset = irq - chip->irq_base;
> + struct pl061_gpio *chip = irq_data_get_irq_chip_data(d);
> + int offset = d->irq - chip->irq_base;
> unsigned long flags;
> u8 gpioie;
>
> @@ -143,10 +143,10 @@ static void pl061_irq_disable(unsigned irq)
> spin_unlock_irqrestore(&chip->irq_lock, flags);
> }
>
> -static void pl061_irq_enable(unsigned irq)
> +static void pl061_irq_enable(struct irq_data *d)
> {
> - struct pl061_gpio *chip = get_irq_chip_data(irq);
> - int offset = irq - chip->irq_base;
> + struct pl061_gpio *chip = irq_data_get_irq_chip_data(d);
> + int offset = d->irq - chip->irq_base;
> unsigned long flags;
> u8 gpioie;
>
> @@ -157,10 +157,10 @@ static void pl061_irq_enable(unsigned irq)
> spin_unlock_irqrestore(&chip->irq_lock, flags);
> }
>
> -static int pl061_irq_type(unsigned irq, unsigned trigger)
> +static int pl061_irq_type(struct irq_data *d, unsigned trigger)
> {
> - struct pl061_gpio *chip = get_irq_chip_data(irq);
> - int offset = irq - chip->irq_base;
> + struct pl061_gpio *chip = irq_data_get_irq_chip_data(d);
> + int offset = d->irq - chip->irq_base;
> unsigned long flags;
> u8 gpiois, gpioibe, gpioiev;
>
> @@ -203,9 +203,9 @@ static int pl061_irq_type(unsigned irq, unsigned trigger)
>
> static struct irq_chip pl061_irqchip = {
> .name = "GPIO",
> - .enable = pl061_irq_enable,
> - .disable = pl061_irq_disable,
> - .set_type = pl061_irq_type,
> + .irq_enable = pl061_irq_enable,
> + .irq_disable = pl061_irq_disable,
> + .irq_set_type = pl061_irq_type,
> };
>
> static void pl061_irq_handler(unsigned irq, struct irq_desc *desc)
> @@ -214,7 +214,7 @@ static void pl061_irq_handler(unsigned irq, struct irq_desc *desc)
> struct list_head *ptr;
> struct pl061_gpio *chip;
>
> - desc->chip->ack(irq);
> + desc->irq_data.chip->irq_ack(&desc->irq_data);
> list_for_each(ptr, chip_list) {
> unsigned long pending;
> int offset;
> @@ -229,7 +229,7 @@ static void pl061_irq_handler(unsigned irq, struct irq_desc *desc)
> for_each_set_bit(offset, &pending, PL061_GPIO_NR)
> generic_handle_irq(pl061_to_irq(&chip->gc, offset));
> }
> - desc->chip->unmask(irq);
> + desc->irq_data.chip->irq_unmask(&desc->irq_data);
> }
>
> static int pl061_probe(struct amba_device *dev, struct amba_id *id)
> --
> 1.7.1
>
--
~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch@tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
next prev parent reply other threads:[~2010-12-13 12:49 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1292240053.git.buytenh@wantstofly.org>
2010-12-13 12:02 ` [PATCH 01/10] gpio: adp5588-gpio: " Lennert Buytenhek
2010-12-13 12:29 ` Hennerich, Michael
2010-12-13 12:02 ` [PATCH 02/10] gpio: langwell_gpio: " Lennert Buytenhek
2010-12-13 12:02 ` [PATCH 03/10] gpio: max732x: " Lennert Buytenhek
2010-12-14 11:24 ` Marc Zyngier
2010-12-13 12:02 ` [PATCH 04/10] gpio: pca953x: " Lennert Buytenhek
2010-12-13 12:02 ` [PATCH 05/10] gpio: pl061: " Lennert Buytenhek
2010-12-13 12:48 ` Baruch Siach [this message]
2010-12-13 12:02 ` [PATCH 06/10] gpio: stmpe-gpio: " Lennert Buytenhek
2010-12-13 12:07 ` Rabin Vincent
2010-12-13 12:03 ` [PATCH 07/10] gpio: sx150x: " Lennert Buytenhek
2010-12-15 19:58 ` Rohit Vaswani
2010-12-13 12:03 ` [PATCH 08/10] gpio: tc35892-gpio: " Lennert Buytenhek
2010-12-13 12:08 ` Rabin Vincent
2010-12-13 12:03 ` [PATCH 09/10] gpio: timbgpio: " Lennert Buytenhek
2010-12-13 12:03 ` [PATCH 10/10] gpio: vr41xx_giu: " Lennert Buytenhek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101213124856.GE5766@jasper.tkos.co.il \
--to=baruch@tkos.co.il \
--cc=akpm@linux-foundation.org \
--cc=buytenh@wantstofly.org \
--cc=david-b@pacbell.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome