[PATCH] fix irq_chip struct for Pb1200/Db1200 platform

[PATCH] fix irq_chip struct for Pb1200/Db1200 platform

[Daniel Mack]

Hi,

the following patch makes external interrupt sources work again
on AMD's Au1200 development boards. The unnamed initialization
of 'external_irq_type' lead to a defective function mapping.

Daniel


--- a/arch/mips/au1000/pb1200/irqmap.c
+++ b/arch/mips/au1000/pb1200/irqmap.c
@@ -151,18 +151,17 @@ static void pb1200_end_irq(unsigned int
static struct irq_chip external_irq_type =
{
#ifdef CONFIG_MIPS_PB1200
-       "Pb1200 Ext",
+       .name = "Pb1200 Ext",
#endif
#ifdef CONFIG_MIPS_DB1200
-       "Db1200 Ext",
+       .name = "Db1200 Ext",
#endif
-       pb1200_startup_irq,
-       pb1200_shutdown_irq,
-       pb1200_enable_irq,
-       pb1200_disable_irq,
-       pb1200_mask_and_ack_irq,
-       pb1200_end_irq,
-       NULL
+       .startup  = pb1200_startup_irq,
+       .shutdown = pb1200_shutdown_irq,
+       .enable   = pb1200_enable_irq,
+       .disable  = pb1200_disable_irq,
+       .mask_ack = pb1200_mask_and_ack_irq,
+       .end      = pb1200_end_irq
};
void _board_init_irq(void)

[PATCH] fix irq_chip struct for Pb1200/Db1200 platform

[Daniel Mack]

Hi,

the following patch makes external interrupt sources work again
on AMD's Au1200 development boards. The unnamed initialization
of 'external_irq_type' lead to a defective function mapping.

I resent it because of the missing Signed-off-by: line, sorry.

Daniel


Signed-off-by: Daniel Mack <daniel@caiaq.de>

--- a/arch/mips/au1000/pb1200/irqmap.c
+++ b/arch/mips/au1000/pb1200/irqmap.c
@@ -151,18 +151,17 @@ static void pb1200_end_irq(unsigned int
static struct irq_chip external_irq_type =
{
#ifdef CONFIG_MIPS_PB1200
-       "Pb1200 Ext",
+       .name = "Pb1200 Ext",
#endif
#ifdef CONFIG_MIPS_DB1200
-       "Db1200 Ext",
+       .name = "Db1200 Ext",
#endif
-       pb1200_startup_irq,
-       pb1200_shutdown_irq,
-       pb1200_enable_irq,
-       pb1200_disable_irq,
-       pb1200_mask_and_ack_irq,
-       pb1200_end_irq,
-       NULL
+       .startup  = pb1200_startup_irq,
+       .shutdown = pb1200_shutdown_irq,
+       .enable   = pb1200_enable_irq,
+       .disable  = pb1200_disable_irq,
+       .mask_ack = pb1200_mask_and_ack_irq,
+       .end      = pb1200_end_irq
};
void _board_init_irq(void)

Re: [PATCH] fix irq_chip struct for Pb1200/Db1200 platform

[Ralf Baechle]

On Fri, Jul 14, 2006 at 04:53:11PM +0200, Daniel Mack wrote:

> the following patch makes external interrupt sources work again
> on AMD's Au1200 development boards. The unnamed initialization
> of 'external_irq_type' lead to a defective function mapping.
> 
> I resent it because of the missing Signed-off-by: line, sorry.

Good - but this patch is still corrupted so doesn't apply, can you
resend with a non-broken mailer?

  Ralf

Re: [PATCH] fix irq_chip struct for Pb1200/Db1200 platform

[Daniel Mack]

On Fri, Jul 14, 2006 at 05:11:28PM +0100, Ralf Baechle wrote:
> > the following patch makes external interrupt sources work again
> > on AMD's Au1200 development boards. The unnamed initialization
> > of 'external_irq_type' lead to a defective function mapping.
> > 
> > I resent it because of the missing Signed-off-by: line, sorry.
> 
> Good - but this patch is still corrupted so doesn't apply, can you
> resend with a non-broken mailer?

It hasn't been line-wrapped or corrupted by my mailer, as one can
see in the mailing list's web archive. 
Anyway, I put it online as a plain text file so anybody should be
able to use it properly:

	http://caiaq.org/linux-mips/patches/irq_chip_pb1200.patch

Daniel

Re: [PATCH] fix irq_chip struct for Pb1200/Db1200 platform

[Ralf Baechle]

On Sat, Jul 15, 2006 at 02:57:47AM +0200, Daniel Mack wrote:
> Date:	Sat, 15 Jul 2006 02:57:47 +0200
> From:	Daniel Mack <daniel@yoobay.net>
> To:	Ralf Baechle <ralf@linux-mips.org>
> Cc:	linux-mips@linux-mips.org
> Subject: Re: [PATCH] fix irq_chip struct for Pb1200/Db1200 platform
> Content-Type: text/plain; charset=us-ascii
> 
> On Fri, Jul 14, 2006 at 05:11:28PM +0100, Ralf Baechle wrote:
> > > the following patch makes external interrupt sources work again
> > > on AMD's Au1200 development boards. The unnamed initialization
> > > of 'external_irq_type' lead to a defective function mapping.
> > > 
> > > I resent it because of the missing Signed-off-by: line, sorry.
> > 
> > Good - but this patch is still corrupted so doesn't apply, can you
> > resend with a non-broken mailer?
> 
> It hasn't been line-wrapped or corrupted by my mailer, as one can
> see in the mailing list's web archive. 

Same corrupt stuff:

$ wget http://caiaq.org/linux-mips/patches/irq_chip_pb1200.patch
--05:36:02--  http://caiaq.org/linux-mips/patches/irq_chip_pb1200.patch
           => `irq_chip_pb1200.patch'
Resolving caiaq.org... 212.112.241.133
Connecting to caiaq.org|212.112.241.133|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 1,057 (1.0K) [text/plain]

100%[====================================>] 1,057         --.--K/s

05:36:02 (77.54 MB/s) - `irq_chip_pb1200.patch' saved [1057/1057]

$ patch -p1 < irq_chip_pb1200.patch
patching file arch/mips/au1000/pb1200/irqmap.c
patch: **** malformed patch at line 15: static struct irq_chip external_irq_type =

$

  Ralf

Re: [PATCH] fix irq_chip struct for Pb1200/Db1200 platform

[Daniel Mack]

On Sat, Jul 15, 2006 at 05:39:41AM +0100, Ralf Baechle wrote:
> Same corrupt stuff:
> 
> $ wget http://caiaq.org/linux-mips/patches/irq_chip_pb1200.patch
> --05:36:02--  http://caiaq.org/linux-mips/patches/irq_chip_pb1200.patch

Argh, now I see what went wrong - sorry for the hazzle. Please 
try again, same link, slightly different content...

Daniel

Re: [PATCH] fix irq_chip struct for Pb1200/Db1200 platform

[Daniel Mack]

On Sat, Jul 15, 2006 at 11:16:14AM +0200, Daniel Mack wrote:
> http://caiaq.org/linux-mips/patches/irq_chip_pb1200.patch

What about this one? Did it apply now?

Daniel

Re: [PATCH] fix irq_chip struct for Pb1200/Db1200 platform

[Domen Puncer]

On 27/07/06 04:32 +0200, Daniel Mack wrote:
> On Sat, Jul 15, 2006 at 11:16:14AM +0200, Daniel Mack wrote:
> > http://caiaq.org/linux-mips/patches/irq_chip_pb1200.patch

Ralf, can you please apply this.
We don't want 2.6.18 greeting pb1200/db1200 users with an oops, do we?

> 
> What about this one? Did it apply now?

It applies and works here. Thanks!


	Domen

> 
> Daniel
> 

Re: [PATCH] fix irq_chip struct for Pb1200/Db1200 platform

[Daniel Mack]

Hi,

On Aug 4, 2006, at 10:27 AM, Domen Puncer wrote:

>> http://caiaq.org/linux-mips/patches/irq_chip_pb1200.patch
>
> Ralf, can you please apply this.
> We don't want 2.6.18 greeting pb1200/db1200 users with an oops, do we?

Is there any change to get this into 2.6.18?

> It applies and works here. Thanks!

Greets,
Daniel