genirq: Move bus locking into __setup_irq()

There is no point in having the irq_bus_lock() protection around all
callers to __setup_irq().

Move it into __setup_irq(). This is also a preparatory patch for addressing
the issues with the irq resource callbacks.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Julia Cartwright <julia@ni.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Brian Norris <briannorris@chromium.org>
Cc: Doug Anderson <dianders@chromium.org>
Cc: linux-rockchip@lists.infradead.org
Cc: John Keeping <john@metanate.com>
Cc: linux-gpio@vger.kernel.org
Link: http://lkml.kernel.org/r/20170629214343.960949031@linutronix.de

1 files changed, 5 insertions, 8 deletions

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 5c11c1730ba5..0934e02fa04e 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1167,6 +1167,8 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
         if (desc->irq_data.chip->flags & IRQCHIP_ONESHOT_SAFE)
                 new->flags &= ~IRQF_ONESHOT;
 
+        chip_bus_lock(desc);
+
         /*
          * The following block of code has to be executed atomically
          */
@@ -1347,6 +1349,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
         }
 
         raw_spin_unlock_irqrestore(&desc->lock, flags);
+        chip_bus_sync_unlock(desc);
 
         irq_setup_timings(desc, new);
 
@@ -1378,6 +1381,8 @@ mismatch:
 out_unlock:
         raw_spin_unlock_irqrestore(&desc->lock, flags);
 
+        chip_bus_sync_unlock(desc);
+
 out_thread:
         if (new->thread) {
                 struct task_struct *t = new->thread;
@@ -1417,9 +1422,7 @@ int setup_irq(unsigned int irq, struct irqaction *act)
         if (retval < 0)
                 return retval;
 
-        chip_bus_lock(desc);
         retval = __setup_irq(irq, desc, act);
-        chip_bus_sync_unlock(desc);
 
         if (retval)
                 irq_chip_pm_put(&desc->irq_data);
@@ -1674,9 +1677,7 @@ int request_threaded_irq(unsigned int irq, irq_handler_t handler,
                 return retval;
         }
 
-        chip_bus_lock(desc);
         retval = __setup_irq(irq, desc, action);
-        chip_bus_sync_unlock(desc);
 
         if (retval) {
                 irq_chip_pm_put(&desc->irq_data);
@@ -1924,9 +1925,7 @@ int setup_percpu_irq(unsigned int irq, struct irqaction *act)
         if (retval < 0)
                 return retval;
 
-        chip_bus_lock(desc);
         retval = __setup_irq(irq, desc, act);
-        chip_bus_sync_unlock(desc);
 
         if (retval)
                 irq_chip_pm_put(&desc->irq_data);
@@ -1980,9 +1979,7 @@ int request_percpu_irq(unsigned int irq, irq_handler_t handler,
                 return retval;
         }
 
-        chip_bus_lock(desc);
         retval = __setup_irq(irq, desc, action);
-        chip_bus_sync_unlock(desc);
 
         if (retval) {
                 irq_chip_pm_put(&desc->irq_data);