9 files changed, 20 insertions, 20 deletions

diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c
index a773b730e432..38dea05df7f8 100644
--- a/arch/arm/mach-pxa/balloon3.c
+++ b/arch/arm/mach-pxa/balloon3.c
@@ -527,8 +527,8 @@ static void __init balloon3_init_irq(void)
         pxa27x_init_irq();
         /* setup extra Balloon3 irqs */
         for (irq = BALLOON3_IRQ(0); irq <= BALLOON3_IRQ(7); irq++) {
-                irq_set_chip(irq, &balloon3_irq_chip);
-                irq_set_handler(irq, handle_level_irq);
+                irq_set_chip_and_handler(irq, &balloon3_irq_chip,
+                                         handle_level_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index 70344cc75743..6251e3f5c62c 100644
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@ -137,8 +137,8 @@ static void __init pxa_init_low_gpio_irq(set_wake_t fn)
         GEDR0 = 0x3;
 
         for (irq = IRQ_GPIO0; irq <= IRQ_GPIO1; irq++) {
-                irq_set_chip(irq, &pxa_low_gpio_chip);
-                irq_set_handler(irq, handle_edge_irq);
+                irq_set_chip_and_handler(irq, &pxa_low_gpio_chip,
+                                         handle_edge_irq);
                 irq_set_chip_data(irq, irq_base(0));
                 set_irq_flags(irq, IRQF_VALID);
         }
@@ -165,8 +165,8 @@ void __init pxa_init_irq(int irq_nr, set_wake_t fn)
                                 __raw_writel(i | IPR_VALID, IRQ_BASE + IPR(i));
 
                         irq = PXA_IRQ(i);
-                        irq_set_chip(irq, &pxa_internal_irq_chip);
-                        irq_set_handler(irq, handle_level_irq);
+                        irq_set_chip_and_handler(irq, &pxa_internal_irq_chip,
+                                                 handle_level_irq);
                         irq_set_chip_data(irq, base);
                         set_irq_flags(irq, IRQF_VALID);
                 }
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c
index a1b094223e31..6307f70ae22a 100644
--- a/arch/arm/mach-pxa/lpd270.c
+++ b/arch/arm/mach-pxa/lpd270.c
@@ -149,8 +149,8 @@ static void __init lpd270_init_irq(void)
 
         /* setup extra LogicPD PXA270 irqs */
         for (irq = LPD270_IRQ(2); irq <= LPD270_IRQ(4); irq++) {
-                irq_set_chip(irq, &lpd270_irq_chip);
-                irq_set_handler(irq, handle_level_irq);
+                irq_set_chip_and_handler(irq, &lpd270_irq_chip,
+                                         handle_level_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
         irq_set_chained_handler(IRQ_GPIO(0), lpd270_irq_handler);
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index 061d01b50094..0fea945dd6f2 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -165,8 +165,8 @@ static void __init lubbock_init_irq(void)
 
         /* setup extra lubbock irqs */
         for (irq = LUBBOCK_IRQ(0); irq <= LUBBOCK_LAST_IRQ; irq++) {
-                irq_set_chip(irq, &lubbock_irq_chip);
-                irq_set_handler(irq, handle_level_irq);
+                irq_set_chip_and_handler(irq, &lubbock_irq_chip,
+                                         handle_level_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index 9ee703225ab8..29b6e7a94e11 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -166,8 +166,8 @@ static void __init mainstone_init_irq(void)
 
         /* setup extra Mainstone irqs */
         for(irq = MAINSTONE_IRQ(0); irq <= MAINSTONE_IRQ(15); irq++) {
-                irq_set_chip(irq, &mainstone_irq_chip);
-                irq_set_handler(irq, handle_level_irq);
+                irq_set_chip_and_handler(irq, &mainstone_irq_chip,
+                                         handle_level_irq);
                 if (irq == MAINSTONE_IRQ(10) || irq == MAINSTONE_IRQ(14))
                         set_irq_flags(irq, IRQF_VALID | IRQF_PROBE | IRQF_NOAUTOEN);
                 else
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c
index 6c02b589d143..4d0120540124 100644
--- a/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -281,8 +281,8 @@ static void __init pcm990_init_irq(void)
 
         /* setup extra PCM990 irqs */
         for (irq = PCM027_IRQ(0); irq <= PCM027_IRQ(3); irq++) {
-                irq_set_chip(irq, &pcm990_irq_chip);
-                irq_set_handler(irq, handle_level_irq);
+                irq_set_chip_and_handler(irq, &pcm990_irq_chip,
+                                         handle_level_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c
index 8abe93f4e519..8dd107391157 100644
--- a/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@ -362,8 +362,8 @@ static void __init pxa_init_ext_wakeup_irq(set_wake_t fn)
         int irq;
 
         for (irq = IRQ_WAKEUP0; irq <= IRQ_WAKEUP1; irq++) {
-                irq_set_chip(irq, &pxa_ext_wakeup_chip);
-                irq_set_handler(irq, handle_edge_irq);
+                irq_set_chip_and_handler(irq, &pxa_ext_wakeup_chip,
+                                         handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID);
         }
 
diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c
index 26facf1cef65..aa70331c0805 100644
--- a/arch/arm/mach-pxa/viper.c
+++ b/arch/arm/mach-pxa/viper.c
@@ -310,8 +310,8 @@ static void __init viper_init_irq(void)
         /* setup ISA IRQs */
         for (level = 0; level < ARRAY_SIZE(viper_isa_irqs); level++) {
                 isa_irq = viper_bit_to_irq(level);
-                irq_set_chip(isa_irq, &viper_irq_chip);
-                irq_set_handler(isa_irq, handle_edge_irq);
+                irq_set_chip_and_handler(isa_irq, &viper_irq_chip,
+                                         handle_edge_irq);
                 set_irq_flags(isa_irq, IRQF_VALID | IRQF_PROBE);
         }
 
diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c
index a7cdc4a83d40..139aa7f2ed90 100644
--- a/arch/arm/mach-pxa/zeus.c
+++ b/arch/arm/mach-pxa/zeus.c
@@ -146,8 +146,8 @@ static void __init zeus_init_irq(void)
         /* Setup ISA IRQs */
         for (level = 0; level < ARRAY_SIZE(zeus_isa_irqs); level++) {
                 isa_irq = zeus_bit_to_irq(level);
-                irq_set_chip(isa_irq, &zeus_irq_chip);
-                irq_set_handler(isa_irq, handle_edge_irq);
+                irq_set_chip_and_handler(isa_irq, &zeus_irq_chip,
+                                         handle_edge_irq);
                 set_irq_flags(isa_irq, IRQF_VALID | IRQF_PROBE);
         }