drivers: Final irq namespace conversion

Scripted with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

5 files changed, 21 insertions, 21 deletions

diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index 09933eb9126b..12e02bf92c4a 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -1226,7 +1226,7 @@ const char *dmar_get_fault_reason(u8 fault_reason, int *fault_type)
 
 void dmar_msi_unmask(struct irq_data *data)
 {
-        struct intel_iommu *iommu = irq_data_get_irq_data(data);
+        struct intel_iommu *iommu = irq_data_get_irq_handler_data(data);
         unsigned long flag;
 
         /* unmask it */
@@ -1240,7 +1240,7 @@ void dmar_msi_unmask(struct irq_data *data)
 void dmar_msi_mask(struct irq_data *data)
 {
         unsigned long flag;
-        struct intel_iommu *iommu = irq_data_get_irq_data(data);
+        struct intel_iommu *iommu = irq_data_get_irq_handler_data(data);
 
         /* mask it */
         spin_lock_irqsave(&iommu->register_lock, flag);
@@ -1252,7 +1252,7 @@ void dmar_msi_mask(struct irq_data *data)
 
 void dmar_msi_write(int irq, struct msi_msg *msg)
 {
-        struct intel_iommu *iommu = get_irq_data(irq);
+        struct intel_iommu *iommu = irq_get_handler_data(irq);
         unsigned long flag;
 
         spin_lock_irqsave(&iommu->register_lock, flag);
@@ -1264,7 +1264,7 @@ void dmar_msi_write(int irq, struct msi_msg *msg)
 
 void dmar_msi_read(int irq, struct msi_msg *msg)
 {
-        struct intel_iommu *iommu = get_irq_data(irq);
+        struct intel_iommu *iommu = irq_get_handler_data(irq);
         unsigned long flag;
 
         spin_lock_irqsave(&iommu->register_lock, flag);
@@ -1382,12 +1382,12 @@ int dmar_set_interrupt(struct intel_iommu *iommu)
                 return -EINVAL;
         }
 
-        set_irq_data(irq, iommu);
+        irq_set_handler_data(irq, iommu);
         iommu->irq = irq;
 
         ret = arch_setup_dmar_msi(irq);
         if (ret) {
-                set_irq_data(irq, NULL);
+                irq_set_handler_data(irq, NULL);
                 iommu->irq = 0;
                 destroy_irq(irq);
                 return ret;
diff --git a/drivers/pci/htirq.c b/drivers/pci/htirq.c
index 834842aa5bbf..db057b6fe0c8 100644
--- a/drivers/pci/htirq.c
+++ b/drivers/pci/htirq.c
@@ -34,7 +34,7 @@ struct ht_irq_cfg {
 
 void write_ht_irq_msg(unsigned int irq, struct ht_irq_msg *msg)
 {
-        struct ht_irq_cfg *cfg = get_irq_data(irq);
+        struct ht_irq_cfg *cfg = irq_get_handler_data(irq);
         unsigned long flags;
         spin_lock_irqsave(&ht_irq_lock, flags);
         if (cfg->msg.address_lo != msg->address_lo) {
@@ -53,13 +53,13 @@ void write_ht_irq_msg(unsigned int irq, struct ht_irq_msg *msg)
 
 void fetch_ht_irq_msg(unsigned int irq, struct ht_irq_msg *msg)
 {
-        struct ht_irq_cfg *cfg = get_irq_data(irq);
+        struct ht_irq_cfg *cfg = irq_get_handler_data(irq);
         *msg = cfg->msg;
 }
 
 void mask_ht_irq(struct irq_data *data)
 {
-        struct ht_irq_cfg *cfg = irq_data_get_irq_data(data);
+        struct ht_irq_cfg *cfg = irq_data_get_irq_handler_data(data);
         struct ht_irq_msg msg = cfg->msg;
 
         msg.address_lo |= 1;
@@ -68,7 +68,7 @@ void mask_ht_irq(struct irq_data *data)
 
 void unmask_ht_irq(struct irq_data *data)
 {
-        struct ht_irq_cfg *cfg = irq_data_get_irq_data(data);
+        struct ht_irq_cfg *cfg = irq_data_get_irq_handler_data(data);
         struct ht_irq_msg msg = cfg->msg;
 
         msg.address_lo &= ~1;
@@ -126,7 +126,7 @@ int __ht_create_irq(struct pci_dev *dev, int idx, ht_irq_update_t *update)
                 kfree(cfg);
                 return -EBUSY;
         }
-        set_irq_data(irq, cfg);
+        irq_set_handler_data(irq, cfg);
 
         if (arch_setup_ht_irq(irq, dev) < 0) {
                 ht_destroy_irq(irq);
@@ -162,9 +162,9 @@ void ht_destroy_irq(unsigned int irq)
 {
         struct ht_irq_cfg *cfg;
 
-        cfg = get_irq_data(irq);
-        set_irq_chip(irq, NULL);
-        set_irq_data(irq, NULL);
+        cfg = irq_get_handler_data(irq);
+        irq_set_chip(irq, NULL);
+        irq_set_handler_data(irq, NULL);
         destroy_irq(irq);
 
         kfree(cfg);
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index a4115f1afe1f..7da3bef60d87 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -1206,7 +1206,7 @@ void free_dmar_iommu(struct intel_iommu *iommu)
                 iommu_disable_translation(iommu);
 
         if (iommu->irq) {
-                set_irq_data(iommu->irq, NULL);
+                irq_set_handler_data(iommu->irq, NULL);
                 /* This will mask the irq */
                 free_irq(iommu->irq, iommu);
                 destroy_irq(iommu->irq);
diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c
index ec87cd66f3eb..a22557b20283 100644
--- a/drivers/pci/intr_remapping.c
+++ b/drivers/pci/intr_remapping.c
@@ -50,7 +50,7 @@ static DEFINE_SPINLOCK(irq_2_ir_lock);
 
 static struct irq_2_iommu *irq_2_iommu(unsigned int irq)
 {
-        struct irq_cfg *cfg = get_irq_chip_data(irq);
+        struct irq_cfg *cfg = irq_get_chip_data(irq);
         return cfg ? &cfg->irq_2_iommu : NULL;
 }
 
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 44b0aeee83e5..2f10328bf661 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -236,7 +236,7 @@ void __read_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
 
 void read_msi_msg(unsigned int irq, struct msi_msg *msg)
 {
-        struct msi_desc *entry = get_irq_msi(irq);
+        struct msi_desc *entry = irq_get_msi_desc(irq);
 
         __read_msi_msg(entry, msg);
 }
@@ -253,7 +253,7 @@ void __get_cached_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
 
 void get_cached_msi_msg(unsigned int irq, struct msi_msg *msg)
 {
-        struct msi_desc *entry = get_irq_msi(irq);
+        struct msi_desc *entry = irq_get_msi_desc(irq);
 
         __get_cached_msi_msg(entry, msg);
 }
@@ -297,7 +297,7 @@ void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
 
 void write_msi_msg(unsigned int irq, struct msi_msg *msg)
 {
-        struct msi_desc *entry = get_irq_msi(irq);
+        struct msi_desc *entry = irq_get_msi_desc(irq);
 
         __write_msi_msg(entry, msg);
 }
@@ -354,7 +354,7 @@ static void __pci_restore_msi_state(struct pci_dev *dev)
         if (!dev->msi_enabled)
                 return;
 
-        entry = get_irq_msi(dev->irq);
+        entry = irq_get_msi_desc(dev->irq);
         pos = entry->msi_attrib.pos;
 
         pci_intx_for_msi(dev, 0);
@@ -519,7 +519,7 @@ static void msix_program_entries(struct pci_dev *dev,
                                                 PCI_MSIX_ENTRY_VECTOR_CTRL;
 
                 entries[i].vector = entry->irq;
-                set_irq_msi(entry->irq, entry);
+                irq_set_msi_desc(entry->irq, entry);
                 entry->masked = readl(entry->mask_base + offset);
                 msix_mask_irq(entry, 1);
                 i++;