| Message ID | 1399940993-1773-6-git-send-email-robherring2@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Rob, On Mon, May 12, 2014 at 07:29:51PM -0500, Rob Herring wrote: > From: Rob Herring <robh@kernel.org> > > Adding function type checking to IRQCHIP_OF_DECLARE found a type mismatch > with s3c2410_init_intc_of and s3c2416_init_intc_of. The function only takes > the 1st 2 parameters. > > Signed-off-by: Rob Herring <robh@kernel.org> > Cc: Thomas Gleixner <tglx@linutronix.de> > --- > drivers/irqchip/irq-s3c24xx.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) Thomas has asked me to give him a hand with the patches for drivers/irqchip. When you add these two to your tree, could you amend the subject line to conform with the other patches in that directory? eg (note the capitalization on 'Fix'): irqchip: s3c24xx: Fix function type for IRQCHIP_OF_DECLARE irqchip: mxs: Fix function type for IRQCHIP_OF_DECLARE With that change, Acked-by: Jason Cooper <jason@lakedaemon.net> Or, if you like, I can apply these two to the branch I'm staging for Thomas. Either is fine with me. thx, Jason.
On Tue, May 13, 2014 at 10:22 AM, Jason Cooper <jason@lakedaemon.net> wrote: > Rob, > > On Mon, May 12, 2014 at 07:29:51PM -0500, Rob Herring wrote: >> From: Rob Herring <robh@kernel.org> >> >> Adding function type checking to IRQCHIP_OF_DECLARE found a type mismatch >> with s3c2410_init_intc_of and s3c2416_init_intc_of. The function only takes >> the 1st 2 parameters. >> >> Signed-off-by: Rob Herring <robh@kernel.org> >> Cc: Thomas Gleixner <tglx@linutronix.de> >> --- >> drivers/irqchip/irq-s3c24xx.c | 6 ++---- >> 1 file changed, 2 insertions(+), 4 deletions(-) > > Thomas has asked me to give him a hand with the patches for > drivers/irqchip. When you add these two to your tree, could you amend > the subject line to conform with the other patches in that directory? Excellent! We've needed some help there for a long time. Is there a patch in flight to add this to MAINTAINERS. > eg (note the capitalization on 'Fix'): > > irqchip: s3c24xx: Fix function type for IRQCHIP_OF_DECLARE > irqchip: mxs: Fix function type for IRQCHIP_OF_DECLARE Will do. > > With that change, > > Acked-by: Jason Cooper <jason@lakedaemon.net> > > Or, if you like, I can apply these two to the branch I'm staging for > Thomas. Either is fine with me. > > thx, > > Jason.
On Tue, May 13, 2014 at 12:02:06PM -0500, Rob Herring wrote: > On Tue, May 13, 2014 at 10:22 AM, Jason Cooper <jason@lakedaemon.net> wrote: > > Rob, > > > > On Mon, May 12, 2014 at 07:29:51PM -0500, Rob Herring wrote: > >> From: Rob Herring <robh@kernel.org> > >> > >> Adding function type checking to IRQCHIP_OF_DECLARE found a type mismatch > >> with s3c2410_init_intc_of and s3c2416_init_intc_of. The function only takes > >> the 1st 2 parameters. > >> > >> Signed-off-by: Rob Herring <robh@kernel.org> > >> Cc: Thomas Gleixner <tglx@linutronix.de> > >> --- > >> drivers/irqchip/irq-s3c24xx.c | 6 ++---- > >> 1 file changed, 2 insertions(+), 4 deletions(-) > > > > Thomas has asked me to give him a hand with the patches for > > drivers/irqchip. When you add these two to your tree, could you amend > > the subject line to conform with the other patches in that directory? > > Excellent! We've needed some help there for a long time. Is there a > patch in flight to add this to MAINTAINERS. See: https://lkml.kernel.org/r/1400006821-32145-1-git-send-email-jason@lakedaemon.net and it's now in irq/urgent in the tip tree. thx, Jason.
diff --git a/drivers/irqchip/irq-s3c24xx.c b/drivers/irqchip/irq-s3c24xx.c index bbcc944..78a6acc 100644 --- a/drivers/irqchip/irq-s3c24xx.c +++ b/drivers/irqchip/irq-s3c24xx.c @@ -1323,8 +1323,7 @@ static struct s3c24xx_irq_of_ctrl s3c2410_ctrl[] = { }; int __init s3c2410_init_intc_of(struct device_node *np, - struct device_node *interrupt_parent, - struct s3c24xx_irq_of_ctrl *ctrl, int num_ctrl) + struct device_node *interrupt_parent) { return s3c_init_intc_of(np, interrupt_parent, s3c2410_ctrl, ARRAY_SIZE(s3c2410_ctrl)); @@ -1346,8 +1345,7 @@ static struct s3c24xx_irq_of_ctrl s3c2416_ctrl[] = { }; int __init s3c2416_init_intc_of(struct device_node *np, - struct device_node *interrupt_parent, - struct s3c24xx_irq_of_ctrl *ctrl, int num_ctrl) + struct device_node *interrupt_parent) { return s3c_init_intc_of(np, interrupt_parent, s3c2416_ctrl, ARRAY_SIZE(s3c2416_ctrl));