arm: Fold irq_set_chip/irq_set_handler

[deliverable/linux.git] / arch / arm / plat-samsung / irq-uart.c

diff --git a/arch/arm/plat-samsung/irq-uart.c b/arch/arm/plat-samsung/irq-uart.c
index 9dbad70bdd09784b3cc2b70b65a48a566293ea64..4d4e571af5530dfd8ff5d72ef74be8d25b8a9b55 100644 (file)
--- a/arch/arm/plat-samsung/irq-uart.c
+++ b/arch/arm/plat-samsung/irq-uart.c
@@ -117,8 +117,7 @@ static void __init s3c_init_uart_irq(struct s3c_uart_irq *uirq)
        for (offs = 0; offs < 3; offs++) {
                irq = uirq->base_irq + offs;
 
-               irq_set_chip(irq, &s3c_irq_uart);
-               irq_set_handler(irq, handle_level_irq);
+               irq_set_chip_and_handler(irq, &s3c_irq_uart, handle_level_irq);
                irq_set_chip_data(irq, uirq);
                set_irq_flags(irq, IRQF_VALID);
        }