diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-25 11:45:20 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-03-29 08:48:12 -0400 |
commit | ec775d0e70eb6b7116406b3441cb8501c2849dd2 (patch) | |
tree | 3c9f5bfb1f5a4cde6754517dccaacd9e91a05cf4 /arch/powerpc/sysdev/mpic.c | |
parent | 7bfbc1f28311d680e45d7122ecd48dec57703750 (diff) |
powerpc: Convert to new irq_* function names
Scripted with coccinelle.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/powerpc/sysdev/mpic.c')
-rw-r--r-- | arch/powerpc/sysdev/mpic.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index edf1f37eaca3..f91c065bed5a 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
@@ -615,7 +615,7 @@ static struct mpic *mpic_find(unsigned int irq) | |||
615 | if (irq < NUM_ISA_INTERRUPTS) | 615 | if (irq < NUM_ISA_INTERRUPTS) |
616 | return NULL; | 616 | return NULL; |
617 | 617 | ||
618 | return get_irq_chip_data(irq); | 618 | return irq_get_chip_data(irq); |
619 | } | 619 | } |
620 | 620 | ||
621 | /* Determine if the linux irq is an IPI */ | 621 | /* Determine if the linux irq is an IPI */ |
@@ -649,7 +649,7 @@ static inline struct mpic * mpic_from_ipi(struct irq_data *d) | |||
649 | /* Get the mpic structure from the irq number */ | 649 | /* Get the mpic structure from the irq number */ |
650 | static inline struct mpic * mpic_from_irq(unsigned int irq) | 650 | static inline struct mpic * mpic_from_irq(unsigned int irq) |
651 | { | 651 | { |
652 | return get_irq_chip_data(irq); | 652 | return irq_get_chip_data(irq); |
653 | } | 653 | } |
654 | 654 | ||
655 | /* Get the mpic structure from the irq data */ | 655 | /* Get the mpic structure from the irq data */ |
@@ -978,8 +978,8 @@ static int mpic_host_map(struct irq_host *h, unsigned int virq, | |||
978 | WARN_ON(!(mpic->flags & MPIC_PRIMARY)); | 978 | WARN_ON(!(mpic->flags & MPIC_PRIMARY)); |
979 | 979 | ||
980 | DBG("mpic: mapping as IPI\n"); | 980 | DBG("mpic: mapping as IPI\n"); |
981 | set_irq_chip_data(virq, mpic); | 981 | irq_set_chip_data(virq, mpic); |
982 | set_irq_chip_and_handler(virq, &mpic->hc_ipi, | 982 | irq_set_chip_and_handler(virq, &mpic->hc_ipi, |
983 | handle_percpu_irq); | 983 | handle_percpu_irq); |
984 | return 0; | 984 | return 0; |
985 | } | 985 | } |
@@ -1001,11 +1001,11 @@ static int mpic_host_map(struct irq_host *h, unsigned int virq, | |||
1001 | 1001 | ||
1002 | DBG("mpic: mapping to irq chip @%p\n", chip); | 1002 | DBG("mpic: mapping to irq chip @%p\n", chip); |
1003 | 1003 | ||
1004 | set_irq_chip_data(virq, mpic); | 1004 | irq_set_chip_data(virq, mpic); |
1005 | set_irq_chip_and_handler(virq, chip, handle_fasteoi_irq); | 1005 | irq_set_chip_and_handler(virq, chip, handle_fasteoi_irq); |
1006 | 1006 | ||
1007 | /* Set default irq type */ | 1007 | /* Set default irq type */ |
1008 | set_irq_type(virq, IRQ_TYPE_NONE); | 1008 | irq_set_irq_type(virq, IRQ_TYPE_NONE); |
1009 | 1009 | ||
1010 | /* If the MPIC was reset, then all vectors have already been | 1010 | /* If the MPIC was reset, then all vectors have already been |
1011 | * initialized. Otherwise, a per source lazy initialization | 1011 | * initialized. Otherwise, a per source lazy initialization |