From: Greg Ungerer <gerg@snapgear.com>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: LKML <linux-kernel@vger.kernel.org>, Greg Ungerer <gerg@uclinux.org>
Subject: Re: m68knommu: Convert to new irq function names
Date: Mon, 28 Mar 2011 10:38:42 +1000 [thread overview]
Message-ID: <4D8FD892.3040200@snapgear.com> (raw)
In-Reply-To: <alpine.LFD.2.00.1103251443180.31464@localhost6.localdomain6>
Hi Thomas,
On 25/03/11 23:44, Thomas Gleixner wrote:
> Scripted conversion with coccinelle.
>
> Signed-off-by: Thomas Gleixner<tglx@linutronix.de>
Looks good, and works fine after reworking for the m68k/m68knommu
merge. Do you want me to carry it for 2.6.40?
Regards
Greg
> ---
> arch/m68knommu/kernel/irq.c | 2 +-
> arch/m68knommu/platform/5249/intc2.c | 4 ++--
> arch/m68knommu/platform/5272/intc.c | 12 ++++++------
> arch/m68knommu/platform/68328/ints.c | 4 ++--
> arch/m68knommu/platform/68360/ints.c | 4 ++--
> arch/m68knommu/platform/coldfire/intc-2.c | 10 +++++-----
> arch/m68knommu/platform/coldfire/intc-simr.c | 10 +++++-----
> arch/m68knommu/platform/coldfire/intc.c | 6 +++---
> 8 files changed, 26 insertions(+), 26 deletions(-)
>
> Index: linux-2.6-tip/arch/m68knommu/kernel/irq.c
> ===================================================================
> --- linux-2.6-tip.orig/arch/m68knommu/kernel/irq.c
> +++ linux-2.6-tip/arch/m68knommu/kernel/irq.c
> @@ -44,7 +44,7 @@ int show_interrupts(struct seq_file *p,
> if (ap) {
> seq_printf(p, "%3d: ", irq);
> seq_printf(p, "%10u ", kstat_irqs(irq));
> - seq_printf(p, "%14s ", get_irq_desc_chip(desc)->name);
> + seq_printf(p, "%14s ", irq_desc_get_chip(desc)->name);
>
> seq_printf(p, "%s", ap->name);
> for (ap = ap->next; ap; ap = ap->next)
> Index: linux-2.6-tip/arch/m68knommu/platform/5249/intc2.c
> ===================================================================
> --- linux-2.6-tip.orig/arch/m68knommu/platform/5249/intc2.c
> +++ linux-2.6-tip/arch/m68knommu/platform/5249/intc2.c
> @@ -51,8 +51,8 @@ static int __init mcf_intc2_init(void)
>
> /* GPIO interrupt sources */
> for (irq = MCFINTC2_GPIOIRQ0; (irq<= MCFINTC2_GPIOIRQ7); irq++) {
> - set_irq_chip(irq,&intc2_irq_gpio_chip);
> - set_irq_handler(irq, handle_edge_irq);
> + irq_set_chip(irq,&intc2_irq_gpio_chip);
> + irq_set_handler(irq, handle_edge_irq);
> }
>
> return 0;
> Index: linux-2.6-tip/arch/m68knommu/platform/5272/intc.c
> ===================================================================
> --- linux-2.6-tip.orig/arch/m68knommu/platform/5272/intc.c
> +++ linux-2.6-tip/arch/m68knommu/platform/5272/intc.c
> @@ -145,7 +145,7 @@ static int intc_irq_set_type(struct irq_
> */
> static void intc_external_irq(unsigned int irq, struct irq_desc *desc)
> {
> - get_irq_desc_chip(desc)->irq_ack(&desc->irq_data);
> + irq_desc_get_chip(desc)->irq_ack(&desc->irq_data);
> handle_simple_irq(irq, desc);
> }
>
> @@ -171,16 +171,16 @@ void __init init_IRQ(void)
> writel(0x88888888, MCF_MBAR + MCFSIM_ICR4);
>
> for (irq = 0; (irq< NR_IRQS); irq++) {
> - set_irq_chip(irq,&intc_irq_chip);
> + irq_set_chip(irq,&intc_irq_chip);
> edge = 0;
> if ((irq>= MCFINT_VECBASE)&& (irq<= MCFINT_VECMAX))
> edge = intc_irqmap[irq - MCFINT_VECBASE].ack;
> if (edge) {
> - set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
> - set_irq_handler(irq, intc_external_irq);
> + irq_set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
> + irq_set_handler(irq, intc_external_irq);
> } else {
> - set_irq_type(irq, IRQ_TYPE_LEVEL_HIGH);
> - set_irq_handler(irq, handle_level_irq);
> + irq_set_irq_type(irq, IRQ_TYPE_LEVEL_HIGH);
> + irq_set_handler(irq, handle_level_irq);
> }
> }
> }
> Index: linux-2.6-tip/arch/m68knommu/platform/68328/ints.c
> ===================================================================
> --- linux-2.6-tip.orig/arch/m68knommu/platform/68328/ints.c
> +++ linux-2.6-tip/arch/m68knommu/platform/68328/ints.c
> @@ -179,8 +179,8 @@ void __init init_IRQ(void)
> IMR = ~0;
>
> for (i = 0; (i< NR_IRQS); i++) {
> - set_irq_chip(i,&intc_irq_chip);
> - set_irq_handler(i, handle_level_irq);
> + irq_set_chip(i,&intc_irq_chip);
> + irq_set_handler(i, handle_level_irq);
> }
> }
>
> Index: linux-2.6-tip/arch/m68knommu/platform/68360/ints.c
> ===================================================================
> --- linux-2.6-tip.orig/arch/m68knommu/platform/68360/ints.c
> +++ linux-2.6-tip/arch/m68knommu/platform/68360/ints.c
> @@ -132,8 +132,8 @@ void init_IRQ(void)
> pquicc->intr_cimr = 0x00000000;
>
> for (i = 0; (i< NR_IRQS); i++) {
> - set_irq_chip(i,&intc_irq_chip);
> - set_irq_handler(i, handle_level_irq);
> + irq_set_chip(i,&intc_irq_chip);
> + irq_set_handler(i, handle_level_irq);
> }
> }
>
> Index: linux-2.6-tip/arch/m68knommu/platform/coldfire/intc-2.c
> ===================================================================
> --- linux-2.6-tip.orig/arch/m68knommu/platform/coldfire/intc-2.c
> +++ linux-2.6-tip/arch/m68knommu/platform/coldfire/intc-2.c
> @@ -164,7 +164,7 @@ static int intc_irq_set_type(struct irq_
> }
>
> if (tb)
> - set_irq_handler(irq, handle_edge_irq);
> + irq_set_handler(irq, handle_edge_irq);
>
> irq -= EINT0;
> pa = __raw_readw(MCFEPORT_EPPAR);
> @@ -204,11 +204,11 @@ void __init init_IRQ(void)
>
> for (irq = MCFINT_VECBASE; (irq< MCFINT_VECBASE + NR_VECS); irq++) {
> if ((irq>= EINT1)&& (irq<=EINT7))
> - set_irq_chip(irq,&intc_irq_chip_edge_port);
> + irq_set_chip(irq,&intc_irq_chip_edge_port);
> else
> - set_irq_chip(irq,&intc_irq_chip);
> - set_irq_type(irq, IRQ_TYPE_LEVEL_HIGH);
> - set_irq_handler(irq, handle_level_irq);
> + irq_set_chip(irq,&intc_irq_chip);
> + irq_set_irq_type(irq, IRQ_TYPE_LEVEL_HIGH);
> + irq_set_handler(irq, handle_level_irq);
> }
> }
>
> Index: linux-2.6-tip/arch/m68knommu/platform/coldfire/intc-simr.c
> ===================================================================
> --- linux-2.6-tip.orig/arch/m68knommu/platform/coldfire/intc-simr.c
> +++ linux-2.6-tip/arch/m68knommu/platform/coldfire/intc-simr.c
> @@ -141,7 +141,7 @@ static int intc_irq_set_type(struct irq_
> }
>
> if (tb)
> - set_irq_handler(irq, handle_edge_irq);
> + irq_set_handler(irq, handle_edge_irq);
>
> ebit = irq2ebit(irq) * 2;
> pa = __raw_readw(MCFEPORT_EPPAR);
> @@ -181,11 +181,11 @@ void __init init_IRQ(void)
> eirq = MCFINT_VECBASE + 64 + (MCFINTC1_ICR0 ? 64 : 0);
> for (irq = MCFINT_VECBASE; (irq< eirq); irq++) {
> if ((irq>= EINT1)&& (irq<= EINT7))
> - set_irq_chip(irq,&intc_irq_chip_edge_port);
> + irq_set_chip(irq,&intc_irq_chip_edge_port);
> else
> - set_irq_chip(irq,&intc_irq_chip);
> - set_irq_type(irq, IRQ_TYPE_LEVEL_HIGH);
> - set_irq_handler(irq, handle_level_irq);
> + irq_set_chip(irq,&intc_irq_chip);
> + irq_set_irq_type(irq, IRQ_TYPE_LEVEL_HIGH);
> + irq_set_handler(irq, handle_level_irq);
> }
> }
>
> Index: linux-2.6-tip/arch/m68knommu/platform/coldfire/intc.c
> ===================================================================
> --- linux-2.6-tip.orig/arch/m68knommu/platform/coldfire/intc.c
> +++ linux-2.6-tip/arch/m68knommu/platform/coldfire/intc.c
> @@ -143,9 +143,9 @@ void __init init_IRQ(void)
> mcf_maskimr(0xffffffff);
>
> for (irq = 0; (irq< NR_IRQS); irq++) {
> - set_irq_chip(irq,&intc_irq_chip);
> - set_irq_type(irq, IRQ_TYPE_LEVEL_HIGH);
> - set_irq_handler(irq, handle_level_irq);
> + irq_set_chip(irq,&intc_irq_chip);
> + irq_set_irq_type(irq, IRQ_TYPE_LEVEL_HIGH);
> + irq_set_handler(irq, handle_level_irq);
> }
> }
>
>
>
>
--
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com
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
next prev parent reply other threads:[~2011-03-28 0:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-25 13:44 m68knommu: Convert to new irq function names Thomas Gleixner
2011-03-28 0:38 ` Greg Ungerer [this message]
2011-03-28 9:53 ` Thomas Gleixner
2011-03-28 12:02 ` Greg Ungerer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D8FD892.3040200@snapgear.com \
--to=gerg@snapgear.com \
--cc=gerg@uclinux.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.