From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: atull@altera.com
Cc: linus.walleij@linaro.org, gnurou@gmail.com,
linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
dinguyen@altera.com, delicious.quinoa@gmail.com,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Subject: [PATCH 5/7] gpio: dwapb: use irq_gc_lock() for locking instead bc's lock
Date: Sat, 22 Mar 2014 17:16:42 +0100 [thread overview]
Message-ID: <1395505004-22650-6-git-send-email-bigeasy@linutronix.de> (raw)
In-Reply-To: <1395505004-22650-1-git-send-email-bigeasy@linutronix.de>
The generic irq chip uses irq_gc_lock() for locking so the
enable/startup and type callbacks should use the same lock. None of
those registers (polarity, mask, enable) are used by the gpio part.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
drivers/gpio/gpio-dwapb.c | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 541b893..752ccb1 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -20,7 +20,6 @@
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/platform_device.h>
-#include <linux/spinlock.h>
#define GPIO_SWPORTA_DR 0x00
#define GPIO_SWPORTA_DDR 0x04
@@ -110,30 +109,26 @@ static void dwapb_irq_enable(struct irq_data *d)
{
struct irq_chip_generic *igc = irq_data_get_irq_chip_data(d);
struct dwapb_gpio *gpio = igc->private;
- struct bgpio_chip *bgc = &gpio->ports[0].bgc;
- unsigned long flags;
u32 val;
- spin_lock_irqsave(&bgc->lock, flags);
+ irq_gc_lock(igc);
val = readl(gpio->regs + GPIO_INTEN);
val |= BIT(d->hwirq);
writel(val, gpio->regs + GPIO_INTEN);
- spin_unlock_irqrestore(&bgc->lock, flags);
+ irq_gc_unlock(igc);
}
static void dwapb_irq_disable(struct irq_data *d)
{
struct irq_chip_generic *igc = irq_data_get_irq_chip_data(d);
struct dwapb_gpio *gpio = igc->private;
- struct bgpio_chip *bgc = &gpio->ports[0].bgc;
- unsigned long flags;
u32 val;
- spin_lock_irqsave(&bgc->lock, flags);
+ irq_gc_lock(igc);
val = readl(gpio->regs + GPIO_INTEN);
val &= ~BIT(d->hwirq);
writel(val, gpio->regs + GPIO_INTEN);
- spin_unlock_irqrestore(&bgc->lock, flags);
+ irq_gc_unlock(igc);
}
static int dwapb_irq_reqres(struct irq_data *d)
@@ -163,15 +158,14 @@ static int dwapb_irq_set_type(struct irq_data *d, u32 type)
{
struct irq_chip_generic *igc = irq_data_get_irq_chip_data(d);
struct dwapb_gpio *gpio = igc->private;
- struct bgpio_chip *bgc = &gpio->ports[0].bgc;
int bit = d->hwirq;
- unsigned long level, polarity, flags;
+ unsigned long level, polarity;
if (type & ~(IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING |
IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW))
return -EINVAL;
- spin_lock_irqsave(&bgc->lock, flags);
+ irq_gc_lock(igc);
level = readl(gpio->regs + GPIO_INTTYPE_LEVEL);
polarity = readl(gpio->regs + GPIO_INT_POLARITY);
@@ -200,7 +194,7 @@ static int dwapb_irq_set_type(struct irq_data *d, u32 type)
writel(level, gpio->regs + GPIO_INTTYPE_LEVEL);
writel(polarity, gpio->regs + GPIO_INT_POLARITY);
- spin_unlock_irqrestore(&bgc->lock, flags);
+ irq_gc_unlock(igc);
return 0;
}
--
1.9.1
next prev parent reply other threads:[~2014-03-22 16:18 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-22 16:16 dwapb: a bug fix a few cleanups, v2 Sebastian Andrzej Siewior
2014-03-22 16:16 ` [PATCH 1/7] ARM: dts: socfpga: add gpio pieces Sebastian Andrzej Siewior
2014-05-05 22:02 ` Olof Johansson
2014-05-06 15:01 ` Alan Tull
2014-05-13 8:45 ` Linus Walleij
2014-03-22 16:16 ` [PATCH 2/7] gpio: dwapb: correct gpio-cells in binding document Sebastian Andrzej Siewior
2014-03-25 20:49 ` Linus Walleij
2014-03-25 20:57 ` Sebastian Andrzej Siewior
2014-03-25 21:00 ` Linus Walleij
2014-03-22 16:16 ` [PATCH 3/7] gpio: dwapb: drop irq_setup_generic_chip() Sebastian Andrzej Siewior
2014-03-22 16:16 ` [PATCH 4/7] gpio: dwapb: use irq_linear_revmap() for the faster lookup Sebastian Andrzej Siewior
2014-03-22 16:16 ` Sebastian Andrzej Siewior [this message]
2014-03-22 16:16 ` [PATCH 6/7] gpio: dwapb: use a second irq chip Sebastian Andrzej Siewior
2014-03-25 18:48 ` delicious quinoa
2014-03-25 19:40 ` Sebastian Andrzej Siewior
2014-03-25 21:36 ` Sebastian Hesselbarth
2014-04-07 9:59 ` Sebastian Andrzej Siewior
2014-04-08 15:11 ` delicious quinoa
2014-04-30 11:13 ` [PATCH 6/7 v2] " Sebastian Andrzej Siewior
2014-05-09 11:46 ` Linus Walleij
2014-05-13 16:17 ` Alan Tull
2014-05-16 15:01 ` Linus Walleij
2014-05-22 9:42 ` Sebastian Andrzej Siewior
2014-05-22 14:08 ` Alan Tull
2014-05-26 21:02 ` Sebastian Andrzej Siewior
2014-05-26 20:58 ` [PATCH v3] " Sebastian Andrzej Siewior
2014-05-27 9:55 ` Jamie Iles
2014-05-27 14:21 ` Linus Walleij
2014-05-27 16:30 ` Sebastian Andrzej Siewior
2014-05-28 9:01 ` Linus Walleij
2014-05-28 9:26 ` Sebastian Andrzej Siewior
2014-03-22 16:16 ` [PATCH 7/7] gpio: dwapb: use d->mask instead od BIT(bit) Sebastian Andrzej Siewior
2014-03-25 2:17 ` Alexandre Courbot
2014-03-25 7:54 ` Sebastian Andrzej Siewior
2014-03-25 21:18 ` [PATCH 7/7 v2] " Sebastian Andrzej Siewior
2014-03-25 21:25 ` Joe Perches
2014-03-25 20:45 ` dwapb: a bug fix a few cleanups, v2 Linus Walleij
2014-03-25 21:26 ` Sebastian Hesselbarth
2014-03-25 21:39 ` Sebastian Hesselbarth
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=1395505004-22650-6-git-send-email-bigeasy@linutronix.de \
--to=bigeasy@linutronix.de \
--cc=atull@altera.com \
--cc=delicious.quinoa@gmail.com \
--cc=dinguyen@altera.com \
--cc=gnurou@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).