Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-05 03:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

pinctrl: pinctrl-adi2: Remove nested lock+irqsave that resue flags.

Browse Source 
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>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Sonic Zhang 2013-10-08 15:30:21 +08:00 committed by Linus Walleij
parent a047914e7f
commit 010c51e189
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/pinctrl/pinctrl-adi2.c
View File

@ -247,7 +247,7 @@ static void adi_gpio_ack_irq(struct irq_data *d)
unsigned pintbit = hwirq_to_pintbit(port, d->hwirq); unsigned pintbit = hwirq_to_pintbit(port, d->hwirq);
spin_lock_irqsave(&port->lock, flags); 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 (irqd_get_trigger_type(d) == IRQ_TYPE_EDGE_BOTH) {
if (readl(&regs->invert_set) & pintbit) if (readl(&regs->invert_set) & pintbit)
@ -258,7 +258,7 @@ static void adi_gpio_ack_irq(struct irq_data *d)
writel(pintbit, &regs->request); writel(pintbit, &regs->request);
spin_unlock_irqrestore(&port->pint->lock, flags); spin_unlock(&port->pint->lock);
spin_unlock_irqrestore(&port->lock, flags); 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); unsigned pintbit = hwirq_to_pintbit(port, d->hwirq);
spin_lock_irqsave(&port->lock, flags); 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 (irqd_get_trigger_type(d) == IRQ_TYPE_EDGE_BOTH) {
if (readl(&regs->invert_set) & pintbit) if (readl(&regs->invert_set) & pintbit)
@ -282,7 +282,7 @@ static void adi_gpio_mask_ack_irq(struct irq_data *d)
writel(pintbit, &regs->request); writel(pintbit, &regs->request);
writel(pintbit, &regs->mask_clear); writel(pintbit, &regs->mask_clear);
spin_unlock_irqrestore(&port->pint->lock, flags); spin_unlock(&port->pint->lock);
spin_unlock_irqrestore(&port->lock, flags); 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; struct gpio_pint_regs *regs = port->pint->regs;
spin_lock_irqsave(&port->lock, flags); 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), &regs->mask_clear); writel(hwirq_to_pintbit(port, d->hwirq), &regs->mask_clear);
spin_unlock_irqrestore(&port->pint->lock, flags); spin_unlock(&port->pint->lock);
spin_unlock_irqrestore(&port->lock, flags); 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; struct gpio_pint_regs *regs = port->pint->regs;
spin_lock_irqsave(&port->lock, flags); 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), &regs->mask_set); writel(hwirq_to_pintbit(port, d->hwirq), &regs->mask_set);
spin_unlock_irqrestore(&port->pint->lock, flags); spin_unlock(&port->pint->lock);
spin_unlock_irqrestore(&port->lock, flags); spin_unlock_irqrestore(&port->lock, flags);
} }
@ -320,15 +320,17 @@ static unsigned int adi_gpio_irq_startup(struct irq_data *d)
{ {
unsigned long flags; unsigned long flags;
struct gpio_port *port = irq_data_get_irq_chip_data(d); 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) { 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; return -ENODEV;
} }
regs = port->pint->regs;
spin_lock_irqsave(&port->lock, flags); spin_lock_irqsave(&port->lock, flags);
spin_lock_irqsave(&port->pint->lock, flags); spin_lock(&port->pint->lock);
port_setup(port, d->hwirq, true); port_setup(port, d->hwirq, true);
writew(BIT(d->hwirq), &port->regs->dir_clear); 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), &regs->mask_set); writel(hwirq_to_pintbit(port, d->hwirq), &regs->mask_set);
spin_unlock_irqrestore(&port->pint->lock, flags); spin_unlock(&port->pint->lock);
spin_unlock_irqrestore(&port->lock, flags); spin_unlock_irqrestore(&port->lock, flags);
return 0; return 0;
@ -349,11 +351,11 @@ static void adi_gpio_irq_shutdown(struct irq_data *d)
struct gpio_pint_regs *regs = port->pint->regs; struct gpio_pint_regs *regs = port->pint->regs;
spin_lock_irqsave(&port->lock, flags); 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), &regs->mask_clear); writel(hwirq_to_pintbit(port, d->hwirq), &regs->mask_clear);
spin_unlock_irqrestore(&port->pint->lock, flags); spin_unlock(&port->pint->lock);
spin_unlock_irqrestore(&port->lock, flags); 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; unsigned long flags;
struct gpio_port *port = irq_data_get_irq_chip_data(d); 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 pintmask;
unsigned int irq = d->irq; unsigned int irq = d->irq;
int ret = 0; int ret = 0;
char buf[16]; char buf[16];
if (!port) { 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; return -ENODEV;
} }
pint_regs = port->pint->regs;
pintmask = hwirq_to_pintbit(port, d->hwirq); pintmask = hwirq_to_pintbit(port, d->hwirq);
spin_lock_irqsave(&port->lock, flags); 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. */ /* In case of interrupt autodetect, set irq type to edge sensitive. */
if (type == IRQ_TYPE_PROBE) if (type == IRQ_TYPE_PROBE)
@ -416,7 +420,7 @@ static int adi_gpio_irq_type(struct irq_data *d, unsigned int type)
} }
out: out:
spin_unlock_irqrestore(&port->pint->lock, flags); spin_unlock(&port->pint->lock);
spin_unlock_irqrestore(&port->lock, flags); spin_unlock_irqrestore(&port->lock, flags);
return ret; return ret;