From: grant.likely@secretlab.ca (Grant Likely)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] gpio/nomadik: use genirq core to track enablement
Date: Tue, 20 Sep 2011 11:37:15 -0600 [thread overview]
Message-ID: <20110920173714.GD7781@ponder.secretlab.ca> (raw)
In-Reply-To: <1316508615-20351-1-git-send-email-linus.walleij@stericsson.com>
On Tue, Sep 20, 2011 at 10:50:15AM +0200, Linus Walleij wrote:
> From: Linus Walleij <linus.walleij@linaro.org>
>
> Currently the Nomadik GPIO driver tracks enabled/disabled interrupt
> status with a local variable, switch to using the interrupt core.
>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Applied both, thanks.
g.
> ---
> drivers/gpio/gpio-nomadik.c | 11 ++---------
> 1 files changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpio/gpio-nomadik.c b/drivers/gpio/gpio-nomadik.c
> index 97e9be9..0b7ec12 100644
> --- a/drivers/gpio/gpio-nomadik.c
> +++ b/drivers/gpio/gpio-nomadik.c
> @@ -58,7 +58,6 @@ struct nmk_gpio_chip {
> u32 rwimsc;
> u32 fwimsc;
> u32 slpm;
> - u32 enabled;
> u32 pull_up;
> };
>
> @@ -605,11 +604,6 @@ static int nmk_gpio_irq_maskunmask(struct irq_data *d, bool enable)
> if (!nmk_chip)
> return -EINVAL;
>
> - if (enable)
> - nmk_chip->enabled |= bitmask;
> - else
> - nmk_chip->enabled &= ~bitmask;
> -
> clk_enable(nmk_chip->clk);
> spin_lock_irqsave(&nmk_gpio_slpm_lock, flags);
> spin_lock(&nmk_chip->lock);
> @@ -653,7 +647,7 @@ static int nmk_gpio_irq_set_wake(struct irq_data *d, unsigned int on)
> spin_lock_irqsave(&nmk_gpio_slpm_lock, flags);
> spin_lock(&nmk_chip->lock);
>
> - if (!(nmk_chip->enabled & bitmask))
> + if (irqd_irq_disabled(d))
> __nmk_gpio_set_wake(nmk_chip, gpio, on);
>
> if (on)
> @@ -670,7 +664,7 @@ static int nmk_gpio_irq_set_wake(struct irq_data *d, unsigned int on)
>
> static int nmk_gpio_irq_set_type(struct irq_data *d, unsigned int type)
> {
> - bool enabled;
> + bool enabled = !irqd_irq_disabled(d);
> bool wake = irqd_is_wakeup_set(d);
> int gpio;
> struct nmk_gpio_chip *nmk_chip;
> @@ -691,7 +685,6 @@ static int nmk_gpio_irq_set_type(struct irq_data *d, unsigned int type)
> clk_enable(nmk_chip->clk);
> spin_lock_irqsave(&nmk_chip->lock, flags);
>
> - enabled = !!(nmk_chip->enabled & bitmask);
> if (enabled)
> __nmk_gpio_irq_modify(nmk_chip, gpio, NORMAL, false);
>
> --
> 1.7.3.2
>
prev parent reply other threads:[~2011-09-20 17:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-20 8:50 [PATCH 2/2] gpio/nomadik: use genirq core to track enablement Linus Walleij
2011-09-20 17:37 ` Grant Likely [this message]
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=20110920173714.GD7781@ponder.secretlab.ca \
--to=grant.likely@secretlab.ca \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).