···263263 */264264void mn10300_set_lateack_irq_type(int irq)265265{266266- set_irq_chip_and_handler(irq, &mn10300_cpu_pic_level,266266+ irq_set_chip_and_handler(irq, &mn10300_cpu_pic_level,267267 handle_level_irq);268268}269269···275275 int irq;276276277277 for (irq = 0; irq < NR_IRQS; irq++)278278- if (get_irq_chip(irq) == &no_irq_chip)278278+ if (irq_get_chip(irq) == &no_irq_chip)279279 /* due to the PIC latching interrupt requests, even280280 * when the IRQ is disabled, IRQ_PENDING is superfluous281281 * and we can use handle_level_irq() for edge-triggered282282 * interrupts */283283- set_irq_chip_and_handler(irq, &mn10300_cpu_pic_edge,283283+ irq_set_chip_and_handler(irq, &mn10300_cpu_pic_edge,284284 handle_level_irq);285285286286 unit_init_IRQ();
···156156 u16 tmp16;157157158158 /* set up the reschedule IPI */159159- set_irq_chip_and_handler(RESCHEDULE_IPI,160160- &mn10300_ipi_type, handle_percpu_irq);159159+ irq_set_chip_and_handler(RESCHEDULE_IPI, &mn10300_ipi_type,160160+ handle_percpu_irq);161161 setup_irq(RESCHEDULE_IPI, &reschedule_ipi);162162 set_intr_level(RESCHEDULE_IPI, RESCHEDULE_GxICR_LV);163163 mn10300_ipi_enable(RESCHEDULE_IPI);164164165165 /* set up the call function IPI */166166- set_irq_chip_and_handler(CALL_FUNC_SINGLE_IPI,167167- &mn10300_ipi_type, handle_percpu_irq);166166+ irq_set_chip_and_handler(CALL_FUNC_SINGLE_IPI, &mn10300_ipi_type,167167+ handle_percpu_irq);168168 setup_irq(CALL_FUNC_SINGLE_IPI, &call_function_ipi);169169 set_intr_level(CALL_FUNC_SINGLE_IPI, CALL_FUNCTION_GxICR_LV);170170 mn10300_ipi_enable(CALL_FUNC_SINGLE_IPI);···172172 /* set up the local timer IPI */173173#if !defined(CONFIG_GENERIC_CLOCKEVENTS) || \174174 defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)175175- set_irq_chip_and_handler(LOCAL_TIMER_IPI,176176- &mn10300_ipi_type, handle_percpu_irq);175175+ irq_set_chip_and_handler(LOCAL_TIMER_IPI, &mn10300_ipi_type,176176+ handle_percpu_irq);177177 setup_irq(LOCAL_TIMER_IPI, &local_timer_ipi);178178 set_intr_level(LOCAL_TIMER_IPI, LOCAL_TIMER_GxICR_LV);179179 mn10300_ipi_enable(LOCAL_TIMER_IPI);
+2-1
arch/mn10300/unit-asb2364/irq-fpga.c
···100100 SyncExBus();101101102102 for (irq = NR_CPU_IRQS; irq < NR_IRQS; irq++)103103- set_irq_chip_and_handler(irq, &asb2364_fpga_pic, handle_level_irq);103103+ irq_set_chip_and_handler(irq, &asb2364_fpga_pic,104104+ handle_level_irq);104105105106 /* the FPGA drives the XIRQ1 input on the CPU PIC */106107 setup_irq(XIRQ1, &fpga_irq[0]);