genirq: Convert core code to irq_data

Convert all references in the core code to orq, chip, handler_data,
chip_data, msi_desc, affinity to irq_data.*

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 27 insertions, 27 deletions

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index c3003e9d91a3..4dfb19521d9f 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -73,8 +73,8 @@ int irq_can_set_affinity(unsigned int irq)
 {
         struct irq_desc *desc = irq_to_desc(irq);
 
-        if (CHECK_IRQ_PER_CPU(desc->status) || !desc->chip ||
-            !desc->chip->set_affinity)
+        if (CHECK_IRQ_PER_CPU(desc->status) || !desc->irq_data.chip ||
+            !desc->irq_data.chip->set_affinity)
                 return 0;
 
         return 1;
@@ -111,15 +111,15 @@ int irq_set_affinity(unsigned int irq, const struct cpumask *cpumask)
         struct irq_desc *desc = irq_to_desc(irq);
         unsigned long flags;
 
-        if (!desc->chip->set_affinity)
+        if (!desc->irq_data.chip->set_affinity)
                 return -EINVAL;
 
         raw_spin_lock_irqsave(&desc->lock, flags);
 
 #ifdef CONFIG_GENERIC_PENDING_IRQ
         if (desc->status & IRQ_MOVE_PCNTXT) {
-                if (!desc->chip->set_affinity(irq, cpumask)) {
-                        cpumask_copy(desc->affinity, cpumask);
+                if (!desc->irq_data.chip->set_affinity(irq, cpumask)) {
+                        cpumask_copy(desc->irq_data.affinity, cpumask);
                         irq_set_thread_affinity(desc);
                 }
         }
@@ -128,8 +128,8 @@ int irq_set_affinity(unsigned int irq, const struct cpumask *cpumask)
                 cpumask_copy(desc->pending_mask, cpumask);
         }
 #else
-        if (!desc->chip->set_affinity(irq, cpumask)) {
-                cpumask_copy(desc->affinity, cpumask);
+        if (!desc->irq_data.chip->set_affinity(irq, cpumask)) {
+                cpumask_copy(desc->irq_data.affinity, cpumask);
                 irq_set_thread_affinity(desc);
         }
 #endif
@@ -168,16 +168,16 @@ static int setup_affinity(unsigned int irq, struct irq_desc *desc)
          * one of the targets is online.
          */
         if (desc->status & (IRQ_AFFINITY_SET | IRQ_NO_BALANCING)) {
-                if (cpumask_any_and(desc->affinity, cpu_online_mask)
+                if (cpumask_any_and(desc->irq_data.affinity, cpu_online_mask)
                     < nr_cpu_ids)
                         goto set_affinity;
                 else
                         desc->status &= ~IRQ_AFFINITY_SET;
         }
 
-        cpumask_and(desc->affinity, cpu_online_mask, irq_default_affinity);
+        cpumask_and(desc->irq_data.affinity, cpu_online_mask, irq_default_affinity);
 set_affinity:
-        desc->chip->set_affinity(irq, desc->affinity);
+        desc->irq_data.chip->set_affinity(irq, desc->irq_data.affinity);
 
         return 0;
 }
@@ -223,7 +223,7 @@ void __disable_irq(struct irq_desc *desc, unsigned int irq, bool suspend)
 
         if (!desc->depth++) {
                 desc->status |= IRQ_DISABLED;
-                desc->chip->disable(irq);
+                desc->irq_data.chip->disable(irq);
         }
 }
 
@@ -313,7 +313,7 @@ void __enable_irq(struct irq_desc *desc, unsigned int irq, bool resume)
  *      IRQ line is re-enabled.
  *
  *      This function may be called from IRQ context only when
- *      desc->chip->bus_lock and desc->chip->bus_sync_unlock are NULL !
+ *      desc->irq_data.chip->bus_lock and desc->chip->bus_sync_unlock are NULL !
  */
 void enable_irq(unsigned int irq)
 {
@@ -336,8 +336,8 @@ static int set_irq_wake_real(unsigned int irq, unsigned int on)
         struct irq_desc *desc = irq_to_desc(irq);
         int ret = -ENXIO;
 
-        if (desc->chip->set_wake)
-                ret = desc->chip->set_wake(irq, on);
+        if (desc->irq_data.chip->set_wake)
+                ret = desc->irq_data.chip->set_wake(irq, on);
 
         return ret;
 }
@@ -432,7 +432,7 @@ int __irq_set_trigger(struct irq_desc *desc, unsigned int irq,
                 unsigned long flags)
 {
         int ret;
-        struct irq_chip *chip = desc->chip;
+        struct irq_chip *chip = desc->irq_data.chip;
 
         if (!chip || !chip->set_type) {
                 /*
@@ -457,8 +457,8 @@ int __irq_set_trigger(struct irq_desc *desc, unsigned int irq,
                 desc->status &= ~(IRQ_LEVEL | IRQ_TYPE_SENSE_MASK);
                 desc->status |= flags;
 
-                if (chip != desc->chip)
-                        irq_chip_set_defaults(desc->chip);
+                if (chip != desc->irq_data.chip)
+                        irq_chip_set_defaults(desc->irq_data.chip);
         }
 
         return ret;
@@ -528,7 +528,7 @@ again:
 
         if (!(desc->status & IRQ_DISABLED) && (desc->status & IRQ_MASKED)) {
                 desc->status &= ~IRQ_MASKED;
-                desc->chip->unmask(irq);
+                desc->irq_data.chip->unmask(irq);
         }
         raw_spin_unlock_irq(&desc->lock);
         chip_bus_sync_unlock(irq, desc);
@@ -556,7 +556,7 @@ irq_thread_check_affinity(struct irq_desc *desc, struct irqaction *action)
         }
 
         raw_spin_lock_irq(&desc->lock);
-        cpumask_copy(mask, desc->affinity);
+        cpumask_copy(mask, desc->irq_data.affinity);
         raw_spin_unlock_irq(&desc->lock);
 
         set_cpus_allowed_ptr(current, mask);
@@ -657,7 +657,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
         if (!desc)
                 return -EINVAL;
 
-        if (desc->chip == &no_irq_chip)
+        if (desc->irq_data.chip == &no_irq_chip)
                 return -ENOSYS;
         /*
          * Some drivers like serial.c use request_irq() heavily,
@@ -752,7 +752,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
         }
 
         if (!shared) {
-                irq_chip_set_defaults(desc->chip);
+                irq_chip_set_defaults(desc->irq_data.chip);
 
                 init_waitqueue_head(&desc->wait_for_threads);
 
@@ -779,7 +779,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
                 if (!(desc->status & IRQ_NOAUTOEN)) {
                         desc->depth = 0;
                         desc->status &= ~IRQ_DISABLED;
-                        desc->chip->startup(irq);
+                        desc->irq_data.chip->startup(irq);
                 } else
                         /* Undo nested disables: */
                         desc->depth = 1;
@@ -912,17 +912,17 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id)
 
         /* Currently used only by UML, might disappear one day: */
 #ifdef CONFIG_IRQ_RELEASE_METHOD
-        if (desc->chip->release)
-                desc->chip->release(irq, dev_id);
+        if (desc->irq_data.chip->release)
+                desc->irq_data.chip->release(irq, dev_id);
 #endif
 
         /* If this was the last handler, shut down the IRQ line: */
         if (!desc->action) {
                 desc->status |= IRQ_DISABLED;
-                if (desc->chip->shutdown)
-                        desc->chip->shutdown(irq);
+                if (desc->irq_data.chip->shutdown)
+                        desc->irq_data.chip->shutdown(irq);
                 else
-                        desc->chip->disable(irq);
+                        desc->irq_data.chip->disable(irq);
         }
 
 #ifdef CONFIG_SMP