[patch V2 28/31] genirq/msi: Mop up old interfaces

[Thomas Gleixner <tglx@xxxxxxxxxxxxx>]

Get rid of the old iterators, alloc/free functions and adjust the core code
accordingly.

Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
 include/linux/msi.h |   15 ---------------
 kernel/irq/msi.c    |   31 +++++++++++++++----------------
 2 files changed, 15 insertions(+), 31 deletions(-)

--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -214,15 +214,7 @@ struct msi_desc *msi_next_desc(struct de
        for ((desc) = msi_first_desc((dev), (filter)); (desc);  \
             (desc) = msi_next_desc((dev), (filter)))
 
-/* Helpers to hide struct msi_desc implementation details */
 #define msi_desc_to_dev(desc)          ((desc)->dev)
-#define dev_to_msi_list(dev)           (&(dev)->msi.data->list)
-#define first_msi_entry(dev)           \
-       list_first_entry(dev_to_msi_list((dev)), struct msi_desc, list)
-#define for_each_msi_entry(desc, dev)  \
-       list_for_each_entry((desc), dev_to_msi_list((dev)), list)
-#define for_each_msi_entry_safe(desc, tmp, dev)        \
-       list_for_each_entry_safe((desc), (tmp), dev_to_msi_list((dev)), list)
 
 #ifdef CONFIG_IRQ_MSI_IOMMU
 static inline const void *msi_desc_get_iommu_cookie(struct msi_desc *desc)
@@ -248,10 +240,6 @@ static inline void msi_desc_set_iommu_co
 #endif
 
 #ifdef CONFIG_PCI_MSI
-#define first_pci_msi_entry(pdev)      first_msi_entry(&(pdev)->dev)
-#define for_each_pci_msi_entry(desc, pdev)     \
-       for_each_msi_entry((desc), &(pdev)->dev)
-
 struct pci_dev *msi_desc_to_pci_dev(struct msi_desc *desc);
 void pci_write_msi_msg(unsigned int irq, struct msi_msg *msg);
 #else /* CONFIG_PCI_MSI */
@@ -273,9 +261,6 @@ static inline void msi_free_msi_descs(st
        msi_free_msi_descs_range(dev, MSI_DESC_ALL, 0, MSI_MAX_INDEX);
 }
 
-struct msi_desc *alloc_msi_entry(struct device *dev, int nvec,
-                                const struct irq_affinity_desc *affinity);
-void free_msi_entry(struct msi_desc *entry);
 void __pci_read_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
 void __pci_write_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
 
--- a/kernel/irq/msi.c
+++ b/kernel/irq/msi.c
@@ -19,8 +19,10 @@
 
 #include "internals.h"
 
+#define dev_to_msi_list(dev)   (&(dev)->msi.data->list)
+
 /**
- * alloc_msi_entry - Allocate an initialized msi_desc
+ * msi_alloc_desc - Allocate an initialized msi_desc
  * @dev:       Pointer to the device for which this is allocated
  * @nvec:      The number of vectors used in this entry
  * @affinity:  Optional pointer to an affinity mask array size of @nvec
@@ -30,12 +32,11 @@
  *
  * Return: pointer to allocated &msi_desc on success or %NULL on failure
  */
-struct msi_desc *alloc_msi_entry(struct device *dev, int nvec,
-                                const struct irq_affinity_desc *affinity)
+static struct msi_desc *msi_alloc_desc(struct device *dev, int nvec,
+                                       const struct irq_affinity_desc 
*affinity)
 {
-       struct msi_desc *desc;
+       struct msi_desc *desc = kzalloc(sizeof(*desc), GFP_KERNEL);
 
-       desc = kzalloc(sizeof(*desc), GFP_KERNEL);
        if (!desc)
                return NULL;
 
@@ -43,21 +44,19 @@ struct msi_desc *alloc_msi_entry(struct
        desc->dev = dev;
        desc->nvec_used = nvec;
        if (affinity) {
-               desc->affinity = kmemdup(affinity,
-                       nvec * sizeof(*desc->affinity), GFP_KERNEL);
+               desc->affinity = kmemdup(affinity, nvec * 
sizeof(*desc->affinity), GFP_KERNEL);
                if (!desc->affinity) {
                        kfree(desc);
                        return NULL;
                }
        }
-
        return desc;
 }
 
-void free_msi_entry(struct msi_desc *entry)
+static void msi_free_desc(struct msi_desc *desc)
 {
-       kfree(entry->affinity);
-       kfree(entry);
+       kfree(desc->affinity);
+       kfree(desc);
 }
 
 /**
@@ -73,7 +72,7 @@ int msi_add_msi_desc(struct device *dev,
 
        lockdep_assert_held(&dev->msi.data->mutex);
 
-       desc = alloc_msi_entry(dev, init_desc->nvec_used, init_desc->affinity);
+       desc = msi_alloc_desc(dev, init_desc->nvec_used, init_desc->affinity);
        if (!desc)
                return -ENOMEM;
 
@@ -102,7 +101,7 @@ static int msi_add_simple_msi_descs(stru
        lockdep_assert_held(&dev->msi.data->mutex);
 
        for (i = 0; i < ndesc; i++) {
-               desc = alloc_msi_entry(dev, 1, NULL);
+               desc = msi_alloc_desc(dev, 1, NULL);
                if (!desc)
                        goto fail;
                desc->msi_index = index + i;
@@ -114,7 +113,7 @@ static int msi_add_simple_msi_descs(stru
 fail:
        list_for_each_entry_safe(desc, tmp, &list, list) {
                list_del(&desc->list);
-               free_msi_entry(desc);
+               msi_free_desc(desc);
        }
        return -ENOMEM;
 }
@@ -141,7 +140,7 @@ void msi_free_msi_descs_range(struct dev
                if (desc->msi_index < first_index || desc->msi_index > 
last_index)
                        continue;
                list_del(&desc->list);
-               free_msi_entry(desc);
+               msi_free_desc(desc);
        }
 }
 
@@ -762,7 +761,7 @@ int msi_domain_populate_irqs(struct irq_
 
        msi_lock_descs(dev);
        for (virq = virq_base; virq < virq_base + nvec; virq++) {
-               desc = alloc_msi_entry(dev, 1, NULL);
+               desc = msi_alloc_desc(dev, 1, NULL);
                if (!desc) {
                        ret = -ENOMEM;
                        goto fail;