소스 검색

ARM: w90x900: irq_data conversion.

Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Wan ZongShun <mcuos.com@gmail.com>
Lennert Buytenhek 14 년 전
부모
커밋
b9858efad3
1개의 변경된 파일10개의 추가작업 그리고 10개의 파일을 삭제
  1. 10 10
      arch/arm/mach-w90x900/irq.c

+ 10 - 10
arch/arm/mach-w90x900/irq.c

@@ -92,15 +92,15 @@ static void nuc900_group_enable(struct group_irq *gpirq, int enable)
 	__raw_writel(regval, REG_AIC_GEN);
 	__raw_writel(regval, REG_AIC_GEN);
 }
 }
 
 
-static void nuc900_irq_mask(unsigned int irq)
+static void nuc900_irq_mask(struct irq_data *d)
 {
 {
 	struct group_irq *group_irq;
 	struct group_irq *group_irq;
 
 
 	group_irq = NULL;
 	group_irq = NULL;
 
 
-	__raw_writel(1 << irq, REG_AIC_MDCR);
+	__raw_writel(1 << d->irq, REG_AIC_MDCR);
 
 
-	switch (irq) {
+	switch (d->irq) {
 	case IRQ_GROUP0:
 	case IRQ_GROUP0:
 		group_irq = &group_nirq0;
 		group_irq = &group_nirq0;
 		break;
 		break;
@@ -143,20 +143,20 @@ static void nuc900_irq_mask(unsigned int irq)
  * to REG_AIC_EOSCR for ACK
  * to REG_AIC_EOSCR for ACK
  */
  */
 
 
-static void nuc900_irq_ack(unsigned int irq)
+static void nuc900_irq_ack(struct irq_data *d)
 {
 {
 	__raw_writel(0x01, REG_AIC_EOSCR);
 	__raw_writel(0x01, REG_AIC_EOSCR);
 }
 }
 
 
-static void nuc900_irq_unmask(unsigned int irq)
+static void nuc900_irq_unmask(struct irq_data *d)
 {
 {
 	struct group_irq *group_irq;
 	struct group_irq *group_irq;
 
 
 	group_irq = NULL;
 	group_irq = NULL;
 
 
-	__raw_writel(1 << irq, REG_AIC_MECR);
+	__raw_writel(1 << d->irq, REG_AIC_MECR);
 
 
-	switch (irq) {
+	switch (d->irq) {
 	case IRQ_GROUP0:
 	case IRQ_GROUP0:
 		group_irq = &group_nirq0;
 		group_irq = &group_nirq0;
 		break;
 		break;
@@ -195,9 +195,9 @@ static void nuc900_irq_unmask(unsigned int irq)
 }
 }
 
 
 static struct irq_chip nuc900_irq_chip = {
 static struct irq_chip nuc900_irq_chip = {
-	.ack	   = nuc900_irq_ack,
-	.mask	   = nuc900_irq_mask,
-	.unmask	   = nuc900_irq_unmask,
+	.irq_ack	= nuc900_irq_ack,
+	.irq_mask	= nuc900_irq_mask,
+	.irq_unmask	= nuc900_irq_unmask,
 };
 };
 
 
 void __init nuc900_init_irq(void)
 void __init nuc900_init_irq(void)