Commit b55a7a5f authored by Olof Johansson's avatar Olof Johansson

Merge tag 'mvebu_gpio_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux into fixes

From Jason Cooper:
 - missing break;s from converting if{}s to switch{}

* tag 'mvebu_gpio_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux:
  gpio: mvebu: Add missing breaks in mvebu_gpio_irq_set_type
parents 327f81c4 7cf8c9f7
...@@ -381,11 +381,13 @@ static int mvebu_gpio_irq_set_type(struct irq_data *d, unsigned int type) ...@@ -381,11 +381,13 @@ static int mvebu_gpio_irq_set_type(struct irq_data *d, unsigned int type)
u = readl_relaxed(mvebu_gpioreg_in_pol(mvchip)); u = readl_relaxed(mvebu_gpioreg_in_pol(mvchip));
u &= ~(1 << pin); u &= ~(1 << pin);
writel_relaxed(u, mvebu_gpioreg_in_pol(mvchip)); writel_relaxed(u, mvebu_gpioreg_in_pol(mvchip));
break;
case IRQ_TYPE_EDGE_FALLING: case IRQ_TYPE_EDGE_FALLING:
case IRQ_TYPE_LEVEL_LOW: case IRQ_TYPE_LEVEL_LOW:
u = readl_relaxed(mvebu_gpioreg_in_pol(mvchip)); u = readl_relaxed(mvebu_gpioreg_in_pol(mvchip));
u |= 1 << pin; u |= 1 << pin;
writel_relaxed(u, mvebu_gpioreg_in_pol(mvchip)); writel_relaxed(u, mvebu_gpioreg_in_pol(mvchip));
break;
case IRQ_TYPE_EDGE_BOTH: { case IRQ_TYPE_EDGE_BOTH: {
u32 v; u32 v;
...@@ -401,6 +403,7 @@ static int mvebu_gpio_irq_set_type(struct irq_data *d, unsigned int type) ...@@ -401,6 +403,7 @@ static int mvebu_gpio_irq_set_type(struct irq_data *d, unsigned int type)
else else
u &= ~(1 << pin); /* rising */ u &= ~(1 << pin); /* rising */
writel_relaxed(u, mvebu_gpioreg_in_pol(mvchip)); writel_relaxed(u, mvebu_gpioreg_in_pol(mvchip));
break;
} }
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment