* [PATCH v2] pinctrl: pinctrl-adi2: Remove nested lock+irqsave that resue flags.
@ 2013-10-08 7:30 Sonic Zhang
2013-10-09 11:07 ` Linus Walleij
0 siblings, 1 reply; 2+ messages in thread
From: Sonic Zhang @ 2013-10-08 7:30 UTC (permalink / raw)
To: Linus Walleij, dan.carpenter; +Cc: LKML, adi-buildroot-devel, Sonic Zhang
From: Sonic Zhang <sonic.zhang@analog.com>
Also avoid use NULL pointer in error message.
v2-changes:
- use port pinter only after checking
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
---
drivers/pinctrl/pinctrl-adi2.c | 40 ++++++++++++++++++++++------------------
1 file changed, 22 insertions(+), 18 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-adi2.c b/drivers/pinctrl/pinctrl-adi2.c
index 7a24e59..157d4af 100644
--- a/drivers/pinctrl/pinctrl-adi2.c
+++ b/drivers/pinctrl/pinctrl-adi2.c
@@ -247,7 +247,7 @@ static void adi_gpio_ack_irq(struct irq_data *d)
unsigned pintbit = hwirq_to_pintbit(port, d->hwirq);
spin_lock_irqsave(&port->lock, flags);
- spin_lock_irqsave(&port->pint->lock, flags);
+ spin_lock(&port->pint->lock);
if (irqd_get_trigger_type(d) == IRQ_TYPE_EDGE_BOTH) {
if (readl(®s->invert_set) & pintbit)
@@ -258,7 +258,7 @@ static void adi_gpio_ack_irq(struct irq_data *d)
writel(pintbit, ®s->request);
- spin_unlock_irqrestore(&port->pint->lock, flags);
+ spin_unlock(&port->pint->lock);
spin_unlock_irqrestore(&port->lock, flags);
}
@@ -270,7 +270,7 @@ static void adi_gpio_mask_ack_irq(struct irq_data *d)
unsigned pintbit = hwirq_to_pintbit(port, d->hwirq);
spin_lock_irqsave(&port->lock, flags);
- spin_lock_irqsave(&port->pint->lock, flags);
+ spin_lock(&port->pint->lock);
if (irqd_get_trigger_type(d) == IRQ_TYPE_EDGE_BOTH) {
if (readl(®s->invert_set) & pintbit)
@@ -282,7 +282,7 @@ static void adi_gpio_mask_ack_irq(struct irq_data *d)
writel(pintbit, ®s->request);
writel(pintbit, ®s->mask_clear);
- spin_unlock_irqrestore(&port->pint->lock, flags);
+ spin_unlock(&port->pint->lock);
spin_unlock_irqrestore(&port->lock, flags);
}
@@ -293,11 +293,11 @@ static void adi_gpio_mask_irq(struct irq_data *d)
struct gpio_pint_regs *regs = port->pint->regs;
spin_lock_irqsave(&port->lock, flags);
- spin_lock_irqsave(&port->pint->lock, flags);
+ spin_lock(&port->pint->lock);
writel(hwirq_to_pintbit(port, d->hwirq), ®s->mask_clear);
- spin_unlock_irqrestore(&port->pint->lock, flags);
+ spin_unlock(&port->pint->lock);
spin_unlock_irqrestore(&port->lock, flags);
}
@@ -308,11 +308,11 @@ static void adi_gpio_unmask_irq(struct irq_data *d)
struct gpio_pint_regs *regs = port->pint->regs;
spin_lock_irqsave(&port->lock, flags);
- spin_lock_irqsave(&port->pint->lock, flags);
+ spin_lock(&port->pint->lock);
writel(hwirq_to_pintbit(port, d->hwirq), ®s->mask_set);
- spin_unlock_irqrestore(&port->pint->lock, flags);
+ spin_unlock(&port->pint->lock);
spin_unlock_irqrestore(&port->lock, flags);
}
@@ -320,15 +320,17 @@ static unsigned int adi_gpio_irq_startup(struct irq_data *d)
{
unsigned long flags;
struct gpio_port *port = irq_data_get_irq_chip_data(d);
- struct gpio_pint_regs *regs = port->pint->regs;
+ struct gpio_pint_regs *regs;
if (!port) {
- dev_err(port->dev, "GPIO IRQ %d :Not exist\n", d->irq);
+ pr_err("GPIO IRQ %d :Not exist\n", d->irq);
return -ENODEV;
}
+ regs = port->pint->regs;
+
spin_lock_irqsave(&port->lock, flags);
- spin_lock_irqsave(&port->pint->lock, flags);
+ spin_lock(&port->pint->lock);
port_setup(port, d->hwirq, true);
writew(BIT(d->hwirq), &port->regs->dir_clear);
@@ -336,7 +338,7 @@ static unsigned int adi_gpio_irq_startup(struct irq_data *d)
writel(hwirq_to_pintbit(port, d->hwirq), ®s->mask_set);
- spin_unlock_irqrestore(&port->pint->lock, flags);
+ spin_unlock(&port->pint->lock);
spin_unlock_irqrestore(&port->lock, flags);
return 0;
@@ -349,11 +351,11 @@ static void adi_gpio_irq_shutdown(struct irq_data *d)
struct gpio_pint_regs *regs = port->pint->regs;
spin_lock_irqsave(&port->lock, flags);
- spin_lock_irqsave(&port->pint->lock, flags);
+ spin_lock(&port->pint->lock);
writel(hwirq_to_pintbit(port, d->hwirq), ®s->mask_clear);
- spin_unlock_irqrestore(&port->pint->lock, flags);
+ spin_unlock(&port->pint->lock);
spin_unlock_irqrestore(&port->lock, flags);
}
@@ -361,21 +363,23 @@ static int adi_gpio_irq_type(struct irq_data *d, unsigned int type)
{
unsigned long flags;
struct gpio_port *port = irq_data_get_irq_chip_data(d);
- struct gpio_pint_regs *pint_regs = port->pint->regs;
+ struct gpio_pint_regs *pint_regs;
unsigned pintmask;
unsigned int irq = d->irq;
int ret = 0;
char buf[16];
if (!port) {
- dev_err(port->dev, "GPIO IRQ %d :Not exist\n", irq);
+ pr_err("GPIO IRQ %d :Not exist\n", d->irq);
return -ENODEV;
}
+ pint_regs = port->pint->regs;
+
pintmask = hwirq_to_pintbit(port, d->hwirq);
spin_lock_irqsave(&port->lock, flags);
- spin_lock_irqsave(&port->pint->lock, flags);
+ spin_lock(&port->pint->lock);
/* In case of interrupt autodetect, set irq type to edge sensitive. */
if (type == IRQ_TYPE_PROBE)
@@ -416,7 +420,7 @@ static int adi_gpio_irq_type(struct irq_data *d, unsigned int type)
}
out:
- spin_unlock_irqrestore(&port->pint->lock, flags);
+ spin_unlock(&port->pint->lock);
spin_unlock_irqrestore(&port->lock, flags);
return ret;
--
1.8.2.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] pinctrl: pinctrl-adi2: Remove nested lock+irqsave that resue flags.
2013-10-08 7:30 [PATCH v2] pinctrl: pinctrl-adi2: Remove nested lock+irqsave that resue flags Sonic Zhang
@ 2013-10-09 11:07 ` Linus Walleij
0 siblings, 0 replies; 2+ messages in thread
From: Linus Walleij @ 2013-10-09 11:07 UTC (permalink / raw)
To: Sonic Zhang; +Cc: Dan Carpenter, LKML, adi-buildroot-devel, Sonic Zhang
On Tue, Oct 8, 2013 at 9:30 AM, Sonic Zhang <sonic.adi@gmail.com> wrote:
> From: Sonic Zhang <sonic.zhang@analog.com>
>
> Also avoid use NULL pointer in error message.
>
> v2-changes:
> - use port pinter only after checking
>
> Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Nice cleanup! Patch applied.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-09 11:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-08 7:30 [PATCH v2] pinctrl: pinctrl-adi2: Remove nested lock+irqsave that resue flags Sonic Zhang
2013-10-09 11:07 ` Linus Walleij
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).