Skip to contentSkip to conversation

m68knommu: Convert irq_chips and use proper accessor functions

PATCH In review Thomas Gleixner 2 participants 16 messages Feb 6, 2011 – Feb 8, 2011

lore
Share & tools
lore
#0 lore raw

cover m68knommu: Convert irq_chips and use proper accessor functions

That's a conversion to the new irq_chips and a cleanup to irq_desc accessor functions. Finally it sets GENERIC_HARDIRQS_NO_DEPRECATED.

Warning: untested.

Thanks,

tglx

#1 lore raw

PATCH 1/10 m68knommu: 5772: Replace private irq flow handler

That handler lacks the minimal checks for action being zero etc. Keep the weird flow - ack before handling - intact and call into handle_simple_irq which does the right thing.

LKML-Reference: <[email protected]>

---
 arch/m68knommu/platform/5272/intc.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
arch/m68knommu/platform/5272/intc.c +1 -4
Index: linux-next/arch/m68knommu/platform/5272/intc.c
===================================================================
@@ -137,11 +137,8 @@ static int intc_irq_set_type(unsigned in
  */
 static void intc_external_irq(unsigned int irq, struct irq_desc *desc)
 {
-	kstat_incr_irqs_this_cpu(irq, desc);
-	desc->status |= IRQ_INPROGRESS;
 	desc->chip->ack(irq);
-	handle_IRQ_event(irq, desc->action);
-	desc->status &= ~IRQ_INPROGRESS;
+	handle_simple_irq(irq, desc);
 }
 
 static struct irq_chip intc_irq_chip = {
Acked-by on v1 1/10
#2 lore raw

Re: [patch 01/10] m68knommu: 5772: Replace private irq flow handler

Hi Thomas,

Quoted 4 lines · Thomas Gleixner

That's a conversion to the new irq_chips and a cleanup to irq_desc accessor functions. Finally it sets GENERIC_HARDIRQS_NO_DEPRECATED.

Warning: untested.

I am fine with all of these, so:

I compile tested to cover all changes, only fix was to patch 7 (as noted in reply to that patch). I can't run test to cover all changes right at the moment, but on the one board I can try it ran with no problems.

Regards
Greg

------------------------------------------------------------------------

Greg Ungerer  --  Principal Engineer        EMAIL:     [email protected]
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close                             FAX:         +61 7 3217 5323
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com
#3 lore raw

Re: [patch 01/10] m68knommu: 5772: Replace private irq flow handler

In reply to Thomas Gleixner

Hi Thomas,

Quoted 7 lines · Thomas Gleixner

That handler lacks the minimal checks for action being zero etc. Keep the weird flow - ack before handling - intact and call into handle_simple_irq which does the right thing.

LKML-Reference: <[email protected]>

Nitpick, the title should read "5272" not "5772".

Regards
Greg

Quoted 21 lines
---
 arch/m68knommu/platform/5272/intc.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Index: linux-next/arch/m68knommu/platform/5272/intc.c
===================================================================

arch/m68knommu/platform/5272/intc.c +1 -4
@@ -137,11 +137,8 @@ static int intc_irq_set_type(unsigned in
  */
 static void intc_external_irq(unsigned int irq, struct irq_desc *desc)
 {
-	kstat_incr_irqs_this_cpu(irq, desc);
-	desc->status |= IRQ_INPROGRESS;
 	desc->chip->ack(irq);
-	handle_IRQ_event(irq, desc->action);
-	desc->status &= ~IRQ_INPROGRESS;
+	handle_simple_irq(irq, desc);
 }
 
 static struct irq_chip intc_irq_chip = {
Signature · 5 lines
------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     [email protected]
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close                             FAX:         +61 7 3217 5323
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com
#4 lore raw

PATCH 2/10 m68knommu Convert coldfire intc irq_chip to new functions

In reply to Thomas Gleixner
---
 arch/m68knommu/platform/coldfire/intc.c |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
arch/m68knommu/platform/coldfire/intc.c +10 -10
Index: linux-next/arch/m68knommu/platform/coldfire/intc.c
===================================================================
@@ -111,28 +111,28 @@ void mcf_autovector(int irq)
 #endif
 }
 
-static void intc_irq_mask(unsigned int irq)
+static void intc_irq_mask(struct irq_data *d)
 {
-	if (mcf_irq2imr[irq])
-		mcf_setimr(mcf_irq2imr[irq]);
+	if (mcf_irq2imr[d->irq])
+		mcf_setimr(mcf_irq2imr[d->irq]);
 }
 
-static void intc_irq_unmask(unsigned int irq)
+static void intc_irq_unmask(struct irq_data *d)
 {
-	if (mcf_irq2imr[irq])
-		mcf_clrimr(mcf_irq2imr[irq]);
+	if (mcf_irq2imr[d->irq])
+		mcf_clrimr(mcf_irq2imr[d->irq]);
 }
 
-static int intc_irq_set_type(unsigned int irq, unsigned int type)
+static int intc_irq_set_type(struct irq_data *d, unsigned int type)
 {
 	return 0;
 }
 
 static struct irq_chip intc_irq_chip = {
 	.name		= "CF-INTC",
-	.mask		= intc_irq_mask,
-	.unmask		= intc_irq_unmask,
-	.set_type	= intc_irq_set_type,
+	.irq_mask	= intc_irq_mask,
+	.irq_unmask	= intc_irq_unmask,
+	.irq_set_type	= intc_irq_set_type,
 };
 
 void __init init_IRQ(void)
#5 lore raw

PATCH 3/10 m68knommu: Convert coldfire intc-2 irq_chip to new functions

In reply to Thomas Gleixner
---
 arch/m68knommu/platform/coldfire/intc-2.c |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
arch/m68knommu/platform/coldfire/intc-2.c +10 -6
Index: linux-next/arch/m68knommu/platform/coldfire/intc-2.c
===================================================================
@@ -43,8 +43,10 @@ static u8 intc_intpri = MCFSIM_ICR_LEVEL
 #define NR_VECS	64
 #endif
 
-static void intc_irq_mask(unsigned int irq)
+static void intc_irq_mask(struct irq_data *d)
 {
+	unsigned int irq = d->irq;
+
 	if ((irq >= MCFINT_VECBASE) && (irq <= MCFINT_VECBASE + NR_VECS)) {
 		unsigned long imraddr;
 		u32 val, imrbit;
@@ -64,8 +66,10 @@ static void intc_irq_mask(unsigned int i
 	}
 }
 
-static void intc_irq_unmask(unsigned int irq)
+static void intc_irq_unmask(struct irq_data *d)
 {
+	unsigned int irq = d->irq;
+
 	if ((irq >= MCFINT_VECBASE) && (irq <= MCFINT_VECBASE + NR_VECS)) {
 		unsigned long intaddr, imraddr, icraddr;
 		u32 val, imrbit;
@@ -93,16 +97,16 @@ static void intc_irq_unmask(unsigned int
 	}
 }
 
-static int intc_irq_set_type(unsigned int irq, unsigned int type)
+static int intc_irq_set_type(struct irq_data *d, unsigned int type)
 {
 	return 0;
 }
 
 static struct irq_chip intc_irq_chip = {
 	.name		= "CF-INTC",
-	.mask		= intc_irq_mask,
-	.unmask		= intc_irq_unmask,
-	.set_type	= intc_irq_set_type,
+	.irq_mask	= intc_irq_mask,
+	.irq_unmask	= intc_irq_unmask,
+	.irq_set_type	= intc_irq_set_type,
 };
 
 void __init init_IRQ(void)
#6 lore raw

PATCH 4/10 m68knommu: Convert coldfire intc-simr irq_chip to new functions

In reply to Thomas Gleixner
---
 arch/m68knommu/platform/coldfire/intc-simr.c |   18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)
arch/m68knommu/platform/coldfire/intc-simr.c +12 -6
Index: linux-next/arch/m68knommu/platform/coldfire/intc-simr.c
===================================================================
@@ -20,8 +20,10 @@
 #include <asm/mcfsim.h>
 #include <asm/traps.h>
 
-static void intc_irq_mask(unsigned int irq)
+static void intc_irq_mask(struct irq_data *d)
 {
+	unsigned int irq = d->irq;
+
 	if (irq >= MCFINT_VECBASE) {
 		if (irq < MCFINT_VECBASE + 64)
 			__raw_writeb(irq - MCFINT_VECBASE, MCFINTC0_SIMR);
@@ -30,8 +32,10 @@ static void intc_irq_mask(unsigned int i
 	}
 }
 
-static void intc_irq_unmask(unsigned int irq)
+static void intc_irq_unmask(struct irq_data *d)
 {
+	unsigned int irq = d->irq;
+
 	if (irq >= MCFINT_VECBASE) {
 		if (irq < MCFINT_VECBASE + 64)
 			__raw_writeb(irq - MCFINT_VECBASE, MCFINTC0_CIMR);
@@ -40,8 +44,10 @@ static void intc_irq_unmask(unsigned int
 	}
 }
 
-static int intc_irq_set_type(unsigned int irq, unsigned int type)
+static int intc_irq_set_type(struct irq_data *d, unsigned int type)
 {
+	unsigned int irq = d->irq;
+
 	if (irq >= MCFINT_VECBASE) {
 		if (irq < MCFINT_VECBASE + 64)
 			__raw_writeb(5, MCFINTC0_ICR0 + irq - MCFINT_VECBASE);
@@ -53,9 +59,9 @@ static int intc_irq_set_type(unsigned in
 
 static struct irq_chip intc_irq_chip = {
 	.name		= "CF-INTC",
-	.mask		= intc_irq_mask,
-	.unmask		= intc_irq_unmask,
-	.set_type	= intc_irq_set_type,
+	.irq_mask	= intc_irq_mask,
+	.irq_unmask	= intc_irq_unmask,
+	.irq_set_type	= intc_irq_set_type,
 };
 
 void __init init_IRQ(void)
#7 lore raw

PATCH 5/10 m68knommu: Convert 68328 ints irq_chip to new functions

In reply to Thomas Gleixner
---
 arch/m68knommu/platform/68328/ints.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
arch/m68knommu/platform/68328/ints.c +6 -6
Index: linux-next/arch/m68knommu/platform/68328/ints.c
===================================================================
@@ -135,20 +135,20 @@ void process_int(int vec, struct pt_regs
 	}
 }
 
-static void intc_irq_unmask(unsigned int irq)
+static void intc_irq_unmask(struct irq_data *d)
 {
-	IMR &= ~(1<<irq);
+	IMR &= ~(1 << d->irq);
 }
 
-static void intc_irq_mask(unsigned int irq)
+static void intc_irq_mask(struct irq_data *d)
 {
-	IMR |= (1<<irq);
+	IMR |= (1 << d->irq);
 }
 
 static struct irq_chip intc_irq_chip = {
 	.name		= "M68K-INTC",
-	.mask		= intc_irq_mask,
-	.unmask		= intc_irq_unmask,
+	.irq_mask	= intc_irq_mask,
+	.irq_unmask	= intc_irq_unmask,
 };
 
 /*
#8 lore raw

PATCH 6/10 m68knommu: Convert 68360 ints irq_chip to new functions

In reply to Thomas Gleixner
---
 arch/m68knommu/platform/68360/ints.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
arch/m68knommu/platform/68360/ints.c +9 -9
Index: linux-next/arch/m68knommu/platform/68360/ints.c
===================================================================
@@ -37,26 +37,26 @@ extern void *_ramvec[];
 /* The number of spurious interrupts */
 volatile unsigned int num_spurious;
 
-static void intc_irq_unmask(unsigned int irq)
+static void intc_irq_unmask(struct irq_data *d)
 {
-	pquicc->intr_cimr |= (1 << irq);
+	pquicc->intr_cimr |= (1 << d->irq);
 }
 
-static void intc_irq_mask(unsigned int irq)
+static void intc_irq_mask(struct irq_data *d)
 {
-	pquicc->intr_cimr &= ~(1 << irq);
+	pquicc->intr_cimr &= ~(1 << d->irq);
 }
 
-static void intc_irq_ack(unsigned int irq)
+static void intc_irq_ack(struct irq_data *d)
 {
-	pquicc->intr_cisr = (1 << irq);
+	pquicc->intr_cisr = (1 << d->irq);
 }
 
 static struct irq_chip intc_irq_chip = {
 	.name		= "M68K-INTC",
-	.mask		= intc_irq_mask,
-	.unmask		= intc_irq_unmask,
-	.ack		= intc_irq_ack,
+	.irq_mask	= intc_irq_mask,
+	.irq_unmask	= intc_irq_unmask,
+	.irq_ack	= intc_irq_ack,
 };
 
 /*
#9 lore raw

PATCH 7/10 m68knommu: Convert 5272 intc irq_chip to new functions

In reply to Thomas Gleixner
---
 arch/m68knommu/platform/5272/intc.c |   28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)
arch/m68knommu/platform/5272/intc.c +18 -10
Index: linux-next/arch/m68knommu/platform/5272/intc.c
===================================================================
@@ -78,8 +78,10 @@ static struct irqmap intc_irqmap[MCFINT_
  * an interrupt on this irq (for the external irqs). So this mask function
  * is also an ack_mask function.
  */
-static void intc_irq_mask(unsigned int irq)
+static void intc_irq_mask(struct irq_data *d)
 {
+	unsigned int irq = d->irq;
+
 	if ((irq >= MCFINT_VECBASE) && (irq <= MCFINT_VECMAX)) {
 		u32 v;
 		irq -= MCFINT_VECBASE;
@@ -88,8 +90,10 @@ static void intc_irq_mask(unsigned int i
 	}
 }
 
-static void intc_irq_unmask(unsigned int irq)
+static void intc_irq_unmask(struct irq_data *d)
 {
+	unsigned int irq = d->irq;
+
 	if ((irq >= MCFINT_VECBASE) && (irq <= MCFINT_VECMAX)) {
 		u32 v;
 		irq -= MCFINT_VECBASE;
@@ -98,8 +102,10 @@ static void intc_irq_unmask(unsigned int
 	}
 }
 
-static void intc_irq_ack(unsigned int irq)
+static void intc_irq_ack(struct irq_data *d)
 {
+	unsigned int irq = d->irq;
+
 	/* Only external interrupts are acked */
 	if ((irq >= MCFINT_VECBASE) && (irq <= MCFINT_VECMAX)) {
 		irq -= MCFINT_VECBASE;
@@ -113,8 +119,10 @@ static void intc_irq_ack(unsigned int ir
 	}
 }
 
-static int intc_irq_set_type(unsigned int irq, unsigned int type)
+static int intc_irq_set_type(struct irq_data *d, unsigned int type)
 {
+	unsigned int irq = d->irq;
+
 	if ((irq >= MCFINT_VECBASE) && (irq <= MCFINT_VECMAX)) {
 		irq -= MCFINT_VECBASE;
 		if (intc_irqmap[irq].ack) {
@@ -137,17 +145,17 @@ static int intc_irq_set_type(unsigned in
  */
 static void intc_external_irq(unsigned int irq, struct irq_desc *desc)
 {
-	desc->chip->ack(irq);
+	get_irq_desc_chip(i)->irq_ack(desc->irq_data);
 	handle_simple_irq(irq, desc);
 }
 
 static struct irq_chip intc_irq_chip = {
 	.name		= "CF-INTC",
-	.mask		= intc_irq_mask,
-	.unmask		= intc_irq_unmask,
-	.mask_ack	= intc_irq_mask,
-	.ack		= intc_irq_ack,
-	.set_type	= intc_irq_set_type,
+	.irq_mask	= intc_irq_mask,
+	.irq_unmask	= intc_irq_unmask,
+	.irq_mask_ack	= intc_irq_mask,
+	.irq_ack	= intc_irq_ack,
+	.irq_set_type	= intc_irq_set_type,
 };
 
 void __init init_IRQ(void)
Acked-by on v1 7/10
#10 lore raw

Re: [patch 07/10] m68knommu: Convert 5272 intc irq_chip to new functions

Hi Thomas,

Quoted 58 lines · Thomas Gleixner
---
 arch/m68knommu/platform/5272/intc.c |   28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

Index: linux-next/arch/m68knommu/platform/5272/intc.c
===================================================================

arch/m68knommu/platform/5272/intc.c +12 -4
@@ -78,8 +78,10 @@ static struct irqmap intc_irqmap[MCFINT_
  * an interrupt on this irq (for the external irqs). So this mask function
  * is also an ack_mask function.
  */
-static void intc_irq_mask(unsigned int irq)
+static void intc_irq_mask(struct irq_data *d)
 {
+	unsigned int irq = d->irq;
+
 	if ((irq >= MCFINT_VECBASE) && (irq <= MCFINT_VECMAX)) {
 		u32 v;
 		irq -= MCFINT_VECBASE;
@@ -88,8 +90,10 @@ static void intc_irq_mask(unsigned int i
 	}
 }
 
-static void intc_irq_unmask(unsigned int irq)
+static void intc_irq_unmask(struct irq_data *d)
 {
+	unsigned int irq = d->irq;
+
 	if ((irq >= MCFINT_VECBASE) && (irq <= MCFINT_VECMAX)) {
 		u32 v;
 		irq -= MCFINT_VECBASE;
@@ -98,8 +102,10 @@ static void intc_irq_unmask(unsigned int
 	}
 }
 
-static void intc_irq_ack(unsigned int irq)
+static void intc_irq_ack(struct irq_data *d)
 {
+	unsigned int irq = d->irq;
+
 	/* Only external interrupts are acked */
 	if ((irq >= MCFINT_VECBASE) && (irq <= MCFINT_VECMAX)) {
 		irq -= MCFINT_VECBASE;
@@ -113,8 +119,10 @@ static void intc_irq_ack(unsigned int ir
 	}
 }
 
-static int intc_irq_set_type(unsigned int irq, unsigned int type)
+static int intc_irq_set_type(struct irq_data *d, unsigned int type)
 {
+	unsigned int irq = d->irq;
+
 	if ((irq >= MCFINT_VECBASE) && (irq <= MCFINT_VECMAX)) {
 		irq -= MCFINT_VECBASE;
 		if (intc_irqmap[irq].ack) {

arch/m68knommu/platform/5272/intc.c static int intc_irq_set_type(unsigned in · line 148

Quoted 5 lines
arch/m68knommu/platform/5272/intc.c +1 -1
@@ -137,17 +145,17 @@ static int intc_irq_set_type(unsigned in
  */
 static void intc_external_irq(unsigned int irq, struct irq_desc *desc)
 {
-	desc->chip->ack(irq);
+	get_irq_desc_chip(i)->irq_ack(desc->irq_data);
                         ^^^         ^^^

should this be:

        get_irq_desc_chip(desc)->irq_ack(&desc->irq_data)

I can't runtime test this right at the moment, but otherwise:

Regards
Greg

Quoted 18 lines
arch/m68knommu/platform/5272/intc.c +5 -5
 	handle_simple_irq(irq, desc);
 }
 
 static struct irq_chip intc_irq_chip = {
 	.name		= "CF-INTC",
-	.mask		= intc_irq_mask,
-	.unmask		= intc_irq_unmask,
-	.mask_ack	= intc_irq_mask,
-	.ack		= intc_irq_ack,
-	.set_type	= intc_irq_set_type,
+	.irq_mask	= intc_irq_mask,
+	.irq_unmask	= intc_irq_unmask,
+	.irq_mask_ack	= intc_irq_mask,
+	.irq_ack	= intc_irq_ack,
+	.irq_set_type	= intc_irq_set_type,
 };
 
 void __init init_IRQ(void)
Signature · 5 lines
------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     [email protected]
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close                             FAX:         +61 7 3217 5323
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com
#11 lore raw

Re: [patch 07/10] m68knommu: Convert 5272 intc irq_chip to new functions

Quoted 8 lines · Greg Ungerer

arch/m68knommu/platform/5272/intc.c static int intc_irq_set_type(unsigned in · line 148

Quoted 4 lines

static void intc_external_irq(unsigned int irq, struct irq_desc *desc) {

arch/m68knommu/platform/5272/intc.c +1 -1
-	desc->chip->ack(irq);
+	get_irq_desc_chip(i)->irq_ack(desc->irq_data);
                         ^^^         ^^^

should this be:

        get_irq_desc_chip(desc)->irq_ack(&desc->irq_data)

Yes.

Quoted 3 lines

I can't runtime test this right at the moment, but otherwise:

Can you push that stuff linus wards for 39 or want me to do it ? It has no dependencies whatsoever.

Thanks,

tglx

#12 lore raw

Re: [patch 07/10] m68knommu: Convert 5272 intc irq_chip to new functions

Hi Thomas,

Quoted 10 lines · Thomas Gleixner
Quoted 8 lines · Greg Ungerer

arch/m68knommu/platform/5272/intc.c static int intc_irq_set_type(unsigned in · line 148

Quoted 4 lines

static void intc_external_irq(unsigned int irq, struct irq_desc *desc) {

arch/m68knommu/platform/5272/intc.c +1 -1
-	desc->chip->ack(irq);
+	get_irq_desc_chip(i)->irq_ack(desc->irq_data);
                          ^^^         ^^^

should this be:

         get_irq_desc_chip(desc)->irq_ack(&desc->irq_data)
Quoted 8 lines

Yes.

Quoted 3 lines

I can't runtime test this right at the moment, but otherwise:

Can you push that stuff linus wards for 39 or want me to do it ? It has no dependencies whatsoever.

I am happy to push this for 39.

Thanks
Greg

------------------------------------------------------------------------

Greg Ungerer  --  Principal Engineer        EMAIL:     [email protected]
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close                             FAX:         +61 7 3217 5323
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com
#13 lore raw

PATCH 8/10 m68knommu Convert 5249 intc irq_chip to new functions

In reply to Thomas Gleixner

/me idly wonders what sets the handlers for this chip.

---
 arch/m68knommu/platform/5249/intc2.c |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
arch/m68knommu/platform/5249/intc2.c +10 -10
Index: linux-next/arch/m68knommu/platform/5249/intc2.c
===================================================================
@@ -17,32 +17,32 @@
 #include <asm/coldfire.h>
 #include <asm/mcfsim.h>
 
-static void intc2_irq_gpio_mask(unsigned int irq)
+static void intc2_irq_gpio_mask(struct irq_data *d)
 {
 	u32 imr;
 	imr = readl(MCF_MBAR2 + MCFSIM2_GPIOINTENABLE);
-	imr &= ~(0x1 << (irq - MCFINTC2_GPIOIRQ0));
+	imr &= ~(0x1 << (d->irq - MCFINTC2_GPIOIRQ0));
 	writel(imr, MCF_MBAR2 + MCFSIM2_GPIOINTENABLE);
 }
 
-static void intc2_irq_gpio_unmask(unsigned int irq)
+static void intc2_irq_gpio_unmask(struct irq_data *d)
 {
 	u32 imr;
 	imr = readl(MCF_MBAR2 + MCFSIM2_GPIOINTENABLE);
-	imr |= (0x1 << (irq - MCFINTC2_GPIOIRQ0));
+	imr |= (0x1 << (d->irq - MCFINTC2_GPIOIRQ0));
 	writel(imr, MCF_MBAR2 + MCFSIM2_GPIOINTENABLE);
 }
 
-static void intc2_irq_gpio_ack(unsigned int irq)
+static void intc2_irq_gpio_ack(struct irq_data *d)
 {
-	writel(0x1 << (irq - MCFINTC2_GPIOIRQ0), MCF_MBAR2 + MCFSIM2_GPIOINTCLEAR);
+	writel(0x1 << (d->irq - MCFINTC2_GPIOIRQ0), MCF_MBAR2 + MCFSIM2_GPIOINTCLEAR);
 }
 
 static struct irq_chip intc2_irq_gpio_chip = {
 	.name		= "CF-INTC2",
-	.mask		= intc2_irq_gpio_mask,
-	.unmask		= intc2_irq_gpio_unmask,
-	.ack		= intc2_irq_gpio_ack,
+	.irq_mask	= intc2_irq_gpio_mask,
+	.irq_unmask	= intc2_irq_gpio_unmask,
+	.irq_ack	= intc2_irq_gpio_ack,
 };
 
 static int __init mcf_intc2_init(void)
@@ -51,7 +51,7 @@ static int __init mcf_intc2_init(void)
 
 	/* GPIO interrupt sources */
 	for (irq = MCFINTC2_GPIOIRQ0; (irq <= MCFINTC2_GPIOIRQ7); irq++)
-		irq_desc[irq].chip = &intc2_irq_gpio_chip;
+		set_irq_chip(irq, &intc2_irq_gpio_chip);
 
 	return 0;
 }
#14 lore raw

PATCH 9/10 m68knommu: Use proper irq_desc accessors in show_interrupts()

In reply to Thomas Gleixner
---
 arch/m68knommu/kernel/irq.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
arch/m68knommu/kernel/irq.c +4 -2
Index: linux-next/arch/m68knommu/kernel/irq.c
===================================================================
@@ -38,11 +38,13 @@ int show_interrupts(struct seq_file *p, 
 		seq_puts(p, "           CPU0\n");
 
 	if (irq < NR_IRQS) {
-		ap = irq_desc[irq].action;
+		struct irq_desc *desc = irq_to_desc(irq);
+
+		ap = desc->action;
 		if (ap) {
 			seq_printf(p, "%3d: ", irq);
 			seq_printf(p, "%10u ", kstat_irqs(irq));
-			seq_printf(p, "%14s  ", irq_desc[irq].chip->name);
+			seq_printf(p, "%14s  ", get_irq_desc_chip(desc)->name);
 
 			seq_printf(p, "%s", ap->name);
 			for (ap = ap->next; ap; ap = ap->next)
#15 lore raw

PATCH 10/10 m68knommu: Select GENERIC_HARDIRQS_NO_DEPRECATED

In reply to Thomas Gleixner

All chips converted and proper accessor functions used.

---
 arch/m68knommu/Kconfig |    1 +
 1 file changed, 1 insertion(+)
arch/m68knommu/Kconfig +1 -0
Index: linux-next/arch/m68knommu/Kconfig
===================================================================
@@ -3,6 +3,7 @@ config M68K
 	default y
 	select HAVE_IDE
 	select HAVE_GENERIC_HARDIRQS
+	select GENERIC_HARDIRQS_NO_DEPRECATED
 
 config MMU
 	bool