浏览代码

[ARM] Fix missed initialisers/missing comma

Fix the broken initialisers missed by the recent IRQ patch.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King 19 年之前
父节点
当前提交
2be863c959
共有 3 个文件被更改,包括 13 次插入13 次删除
  1. 1 1
      arch/arm/mach-ixp2000/core.c
  2. 8 8
      arch/arm/mach-ixp4xx/common.c
  3. 4 4
      arch/arm/mach-omap1/irq.c

+ 1 - 1
arch/arm/mach-ixp2000/core.c

@@ -382,7 +382,7 @@ static void ixp2000_GPIO_irq_unmask(unsigned int irq)
 static struct irqchip ixp2000_GPIO_irq_chip = {
 static struct irqchip ixp2000_GPIO_irq_chip = {
 	.ack		= ixp2000_GPIO_irq_mask_ack,
 	.ack		= ixp2000_GPIO_irq_mask_ack,
 	.mask		= ixp2000_GPIO_irq_mask,
 	.mask		= ixp2000_GPIO_irq_mask,
-	.unmask		= ixp2000_GPIO_irq_unmask
+	.unmask		= ixp2000_GPIO_irq_unmask,
 	.set_type	= ixp2000_GPIO_irq_type,
 	.set_type	= ixp2000_GPIO_irq_type,
 };
 };
 
 

+ 8 - 8
arch/arm/mach-ixp4xx/common.c

@@ -179,17 +179,17 @@ static void ixp4xx_irq_level_unmask(unsigned int irq)
 }
 }
 
 
 static struct irqchip ixp4xx_irq_level_chip = {
 static struct irqchip ixp4xx_irq_level_chip = {
-	.ack	= ixp4xx_irq_mask,
-	.mask	= ixp4xx_irq_mask,
-	.unmask	= ixp4xx_irq_level_unmask,
-	.type	= ixp4xx_set_irq_type
+	.ack		= ixp4xx_irq_mask,
+	.mask		= ixp4xx_irq_mask,
+	.unmask		= ixp4xx_irq_level_unmask,
+	.set_type	= ixp4xx_set_irq_type,
 };
 };
 
 
 static struct irqchip ixp4xx_irq_edge_chip = {
 static struct irqchip ixp4xx_irq_edge_chip = {
-	.ack	= ixp4xx_irq_ack,
-	.mask	= ixp4xx_irq_mask,
-	.unmask	= ixp4xx_irq_unmask,
-	.type	= ixp4xx_set_irq_type
+	.ack		= ixp4xx_irq_ack,
+	.mask		= ixp4xx_irq_mask,
+	.unmask		= ixp4xx_irq_unmask,
+	.set_type	= ixp4xx_set_irq_type,
 };
 };
 
 
 static void ixp4xx_config_irq(unsigned irq, enum ixp4xx_irq_type type)
 static void ixp4xx_config_irq(unsigned irq, enum ixp4xx_irq_type type)

+ 4 - 4
arch/arm/mach-omap1/irq.c

@@ -165,10 +165,10 @@ static struct omap_irq_bank omap1610_irq_banks[] = {
 #endif
 #endif
 
 
 static struct irqchip omap_irq_chip = {
 static struct irqchip omap_irq_chip = {
-	.ack    = omap_mask_ack_irq,
-	.mask   = omap_mask_irq,
-	.unmask = omap_unmask_irq,
-	.wake	= omap_wake_irq,
+	.ack		= omap_mask_ack_irq,
+	.mask		= omap_mask_irq,
+	.unmask		= omap_unmask_irq,
+	.set_wake	= omap_wake_irq,
 };
 };
 
 
 void __init omap_init_irq(void)
 void __init omap_init_irq(void)