openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

bfin: Convert irq namespace 

Convert to the new function names. Scripted with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: uclinux-dist-devel@blackfin.uclinux.org
This commit is contained in:
Thomas Gleixner 2011-03-24 17:22:30 +01:00
parent 1907d8be2d
commit 43f2f1154a
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/blackfin/kernel/irqchip.c
View File

@ -48,7 +48,7 @@ int show_interrupts(struct seq_file *p, void *v)
seq_printf(p, "%3d: ", i); seq_printf(p, "%3d: ", i);
for_each_online_cpu(j) for_each_online_cpu(j)
seq_printf(p, "%10u ", kstat_irqs_cpu(i, j)); seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
seq_printf(p, " %8s", get_irq_desc_chip(desc)->name); seq_printf(p, " %8s", irq_desc_get_chip(desc)->name);
seq_printf(p, " %s", action->name); seq_printf(p, " %s", action->name);
for (action = action->next; action; action = action->next) for (action = action->next; action; action = action->next)
seq_printf(p, " %s", action->name); seq_printf(p, " %s", action->name);

34
arch/blackfin/mach-common/ints-priority.c
View File

@ -559,7 +559,7 @@ static inline void bfin_set_irq_handler(unsigned irq, irq_flow_handler_t handle)
#ifdef CONFIG_IPIPE #ifdef CONFIG_IPIPE
handle = handle_level_irq; handle = handle_level_irq;
#endif #endif
__set_irq_handler_unlocked(irq, handle); __irq_set_handler_locked(irq, handle);
} }
static DECLARE_BITMAP(gpio_enabled, MAX_BLACKFIN_GPIOS); static DECLARE_BITMAP(gpio_enabled, MAX_BLACKFIN_GPIOS);
@ -1163,9 +1163,9 @@ int __init init_arch_irq(void)
for (irq = 0; irq <= SYS_IRQS; irq++) { for (irq = 0; irq <= SYS_IRQS; irq++) {
if (irq <= IRQ_CORETMR) if (irq <= IRQ_CORETMR)
set_irq_chip(irq, &bfin_core_irqchip); irq_set_chip(irq, &bfin_core_irqchip);
else else
set_irq_chip(irq, &bfin_internal_irqchip); irq_set_chip(irq, &bfin_internal_irqchip);
switch (irq) { switch (irq) {
#if defined(CONFIG_BF53x) #if defined(CONFIG_BF53x)
@ -1189,50 +1189,50 @@ int __init init_arch_irq(void)
#elif defined(CONFIG_BF538) || defined(CONFIG_BF539) #elif defined(CONFIG_BF538) || defined(CONFIG_BF539)
case IRQ_PORTF_INTA: case IRQ_PORTF_INTA:
#endif #endif
set_irq_chained_handler(irq, irq_set_chained_handler(irq, bfin_demux_gpio_irq);
bfin_demux_gpio_irq);
break; break;
#ifdef BF537_GENERIC_ERROR_INT_DEMUX #ifdef BF537_GENERIC_ERROR_INT_DEMUX
case IRQ_GENERIC_ERROR: case IRQ_GENERIC_ERROR:
set_irq_chained_handler(irq, bfin_demux_error_irq); irq_set_chained_handler(irq, bfin_demux_error_irq);
break; break;
#endif #endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
case IRQ_MAC_ERROR: case IRQ_MAC_ERROR:
set_irq_chained_handler(irq, bfin_demux_mac_status_irq); irq_set_chained_handler(irq,
bfin_demux_mac_status_irq);
break; break;
#endif #endif
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
case IRQ_SUPPLE_0: case IRQ_SUPPLE_0:
case IRQ_SUPPLE_1: case IRQ_SUPPLE_1:
set_irq_handler(irq, handle_percpu_irq); irq_set_handler(irq, handle_percpu_irq);
break; break;
#endif #endif
#ifdef CONFIG_TICKSOURCE_CORETMR #ifdef CONFIG_TICKSOURCE_CORETMR
case IRQ_CORETMR: case IRQ_CORETMR:
# ifdef CONFIG_SMP # ifdef CONFIG_SMP
set_irq_handler(irq, handle_percpu_irq); irq_set_handler(irq, handle_percpu_irq);
break; break;
# else # else
set_irq_handler(irq, handle_simple_irq); irq_set_handler(irq, handle_simple_irq);
break; break;
# endif # endif
#endif #endif
#ifdef CONFIG_TICKSOURCE_GPTMR0 #ifdef CONFIG_TICKSOURCE_GPTMR0
case IRQ_TIMER0: case IRQ_TIMER0:
set_irq_handler(irq, handle_simple_irq); irq_set_handler(irq, handle_simple_irq);
break; break;
#endif #endif
#ifdef CONFIG_IPIPE #ifdef CONFIG_IPIPE
default: default:
set_irq_handler(irq, handle_level_irq); irq_set_handler(irq, handle_level_irq);
break; break;
#else /* !CONFIG_IPIPE */ #else /* !CONFIG_IPIPE */
default: default:
set_irq_handler(irq, handle_simple_irq); irq_set_handler(irq, handle_simple_irq);
break; break;
#endif /* !CONFIG_IPIPE */ #endif /* !CONFIG_IPIPE */
} }
@ -1240,22 +1240,22 @@ int __init init_arch_irq(void)
#ifdef BF537_GENERIC_ERROR_INT_DEMUX #ifdef BF537_GENERIC_ERROR_INT_DEMUX
for (irq = IRQ_PPI_ERROR; irq <= IRQ_UART1_ERROR; irq++) for (irq = IRQ_PPI_ERROR; irq <= IRQ_UART1_ERROR; irq++)
set_irq_chip_and_handler(irq, &bfin_generic_error_irqchip, irq_set_chip_and_handler(irq, &bfin_generic_error_irqchip,
handle_level_irq); handle_level_irq);
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
set_irq_chained_handler(IRQ_MAC_ERROR, bfin_demux_mac_status_irq); irq_set_chained_handler(IRQ_MAC_ERROR, bfin_demux_mac_status_irq);
#endif #endif
#endif #endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE) #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
for (irq = IRQ_MAC_PHYINT; irq <= IRQ_MAC_STMDONE; irq++) for (irq = IRQ_MAC_PHYINT; irq <= IRQ_MAC_STMDONE; irq++)
set_irq_chip_and_handler(irq, &bfin_mac_status_irqchip, irq_set_chip_and_handler(irq, &bfin_mac_status_irqchip,
handle_level_irq); handle_level_irq);
#endif #endif
/* if configured as edge, then will be changed to do_edge_IRQ */ /* if configured as edge, then will be changed to do_edge_IRQ */
for (irq = GPIO_IRQ_BASE; for (irq = GPIO_IRQ_BASE;
irq < (GPIO_IRQ_BASE + MAX_BLACKFIN_GPIOS); irq++) irq < (GPIO_IRQ_BASE + MAX_BLACKFIN_GPIOS); irq++)
set_irq_chip_and_handler(irq, &bfin_gpio_irqchip, irq_set_chip_and_handler(irq, &bfin_gpio_irqchip,
handle_level_irq); handle_level_irq);
bfin_write_IMASK(0); bfin_write_IMASK(0);