[patch 08/13] mips: Fixup last users of irq_chip->typename

[patch 08/13] mips: Fixup last users of irq_chip->typename

[Thomas Gleixner]

[-- Attachment #1: mips-replace-obsolete-typename.patch --]
[-- Type: text/plain, Size: 3045 bytes --]

The typename member of struct irq_chip was kept for migration purposes
and is obsolete since more than 2 years. Fix up the leftovers.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
---
 arch/mips/nxp/pnx833x/common/interrupts.c |    4 ++--
 arch/mips/sni/a20r.c                      |    2 +-
 arch/mips/sni/pcimt.c                     |    2 +-
 arch/mips/sni/pcit.c                      |    2 +-
 arch/mips/sni/rm200.c                     |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

Index: linux-2.6/arch/mips/nxp/pnx833x/common/interrupts.c
===================================================================
--- linux-2.6.orig/arch/mips/nxp/pnx833x/common/interrupts.c
+++ linux-2.6/arch/mips/nxp/pnx833x/common/interrupts.c
@@ -295,7 +295,7 @@ static int pnx833x_set_type_gpio_irq(uns
 }
 
 static struct irq_chip pnx833x_pic_irq_type = {
-	.typename = "PNX-PIC",
+	.name = "PNX-PIC",
 	.startup = pnx833x_startup_pic_irq,
 	.shutdown = pnx833x_shutdown_pic_irq,
 	.enable = pnx833x_enable_pic_irq,
@@ -305,7 +305,7 @@ static struct irq_chip pnx833x_pic_irq_t
 };
 
 static struct irq_chip pnx833x_gpio_irq_type = {
-	.typename = "PNX-GPIO",
+	.name = "PNX-GPIO",
 	.startup = pnx833x_startup_gpio_irq,
 	.shutdown = pnx833x_disable_gpio_irq,
 	.enable = pnx833x_enable_gpio_irq,
Index: linux-2.6/arch/mips/sni/a20r.c
===================================================================
--- linux-2.6.orig/arch/mips/sni/a20r.c
+++ linux-2.6/arch/mips/sni/a20r.c
@@ -188,7 +188,7 @@ static void end_a20r_irq(unsigned int ir
 }
 
 static struct irq_chip a20r_irq_type = {
-	.typename	= "A20R",
+	.name		= "A20R",
 	.ack		= mask_a20r_irq,
 	.mask		= mask_a20r_irq,
 	.mask_ack	= mask_a20r_irq,
Index: linux-2.6/arch/mips/sni/pcimt.c
===================================================================
--- linux-2.6.orig/arch/mips/sni/pcimt.c
+++ linux-2.6/arch/mips/sni/pcimt.c
@@ -214,7 +214,7 @@ static void end_pcimt_irq(unsigned int i
 }
 
 static struct irq_chip pcimt_irq_type = {
-	.typename = "PCIMT",
+	.name = "PCIMT",
 	.ack = disable_pcimt_irq,
 	.mask = disable_pcimt_irq,
 	.mask_ack = disable_pcimt_irq,
Index: linux-2.6/arch/mips/sni/pcit.c
===================================================================
--- linux-2.6.orig/arch/mips/sni/pcit.c
+++ linux-2.6/arch/mips/sni/pcit.c
@@ -176,7 +176,7 @@ void end_pcit_irq(unsigned int irq)
 }
 
 static struct irq_chip pcit_irq_type = {
-	.typename = "PCIT",
+	.name = "PCIT",
 	.ack = disable_pcit_irq,
 	.mask = disable_pcit_irq,
 	.mask_ack = disable_pcit_irq,
Index: linux-2.6/arch/mips/sni/rm200.c
===================================================================
--- linux-2.6.orig/arch/mips/sni/rm200.c
+++ linux-2.6/arch/mips/sni/rm200.c
@@ -449,7 +449,7 @@ void end_rm200_irq(unsigned int irq)
 }
 
 static struct irq_chip rm200_irq_type = {
-	.typename = "RM200",
+	.name = "RM200",
 	.ack = disable_rm200_irq,
 	.mask = disable_rm200_irq,
 	.mask_ack = disable_rm200_irq,

Re: [patch 08/13] mips: Fixup last users of irq_chip->typename

[Ralf Baechle]

On Tue, Nov 17, 2009 at 10:51:03PM -0000, Thomas Gleixner wrote:

> The typename member of struct irq_chip was kept for migration purposes
> and is obsolete since more than 2 years. Fix up the leftovers.
> 
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: linux-mips@linux-mips.org

Looks good.  I assume you want to merge the whole series via tip, so

Acked-by: Ralf Baechle <ralf@linux-mips.org>

  Ralf

Re: [patch 08/13] mips: Fixup last users of irq_chip->typename

[Thomas Gleixner]

On Wed, 18 Nov 2009, Ralf Baechle wrote:

> On Tue, Nov 17, 2009 at 10:51:03PM -0000, Thomas Gleixner wrote:
> 
> > The typename member of struct irq_chip was kept for migration purposes
> > and is obsolete since more than 2 years. Fix up the leftovers.
> > 
> > Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> > Cc: Ralf Baechle <ralf@linux-mips.org>
> > Cc: linux-mips@linux-mips.org
> 
> Looks good.  I assume you want to merge the whole series via tip, so
> 
> Acked-by: Ralf Baechle <ralf@linux-mips.org>

You can pick it up as well. The patches are independent, just the last
one which removes typename from irq_chip depends on the arch patches
being merged. Either way works fine.

Thanks,

	tglx

Re: [patch 08/13] mips: Fixup last users of irq_chip->typename

[Ralf Baechle]

On Wed, Nov 18, 2009 at 12:09:19AM +0100, Thomas Gleixner wrote:

> > > The typename member of struct irq_chip was kept for migration purposes
> > > and is obsolete since more than 2 years. Fix up the leftovers.
> > > 
> > > Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> > > Cc: Ralf Baechle <ralf@linux-mips.org>
> > > Cc: linux-mips@linux-mips.org
> > 
> > Looks good.  I assume you want to merge the whole series via tip, so
> > 
> > Acked-by: Ralf Baechle <ralf@linux-mips.org>
> 
> You can pick it up as well. The patches are independent, just the last
> one which removes typename from irq_chip depends on the arch patches
> being merged. Either way works fine.

Okay, queued for 2.6.33 then.

Thanks!

  Ralf