genirq/msi: Rename msi_add_msi_desc() to msi_insert_msi_desc()

This reflects the functionality better. No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Acked-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20221124230314.103554618@linutronix.de

diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c
index b94f6da3f32f3b8d0ea36d2f9991f310d2977abc..d107bde58bd6298a04e19fc2c87235d870194a76 100644 (file)
--- a/drivers/pci/msi/msi.c
+++ b/drivers/pci/msi/msi.c
@@ -308,7 +308,7 @@ static int msi_setup_msi_desc(struct pci_dev *dev, int nvec,
        if (desc.pci.msi_attrib.can_mask)
                pci_read_config_dword(dev, desc.pci.mask_pos, &desc.pci.msi_mask);
 
-       return msi_add_msi_desc(&dev->dev, &desc);
+       return msi_insert_msi_desc(&dev->dev, &desc);
 }
 
 static int msi_verify_entries(struct pci_dev *dev)
@@ -591,7 +591,7 @@ static int msix_setup_msi_descs(struct pci_dev *dev, void __iomem *base,
                        desc.pci.msix_ctrl = readl(addr + PCI_MSIX_ENTRY_VECTOR_CTRL);
                }
 
-               ret = msi_add_msi_desc(&dev->dev, &desc);
+               ret = msi_insert_msi_desc(&dev->dev, &desc);
                if (ret)
                        break;
        }

diff --git a/drivers/soc/ti/ti_sci_inta_msi.c b/drivers/soc/ti/ti_sci_inta_msi.c
index 991c78b34745202c8a07c276ab87ebdbfb74a6b4..255849cb81ed5cbef679fefc443b9b354b67086c 100644 (file)
--- a/drivers/soc/ti/ti_sci_inta_msi.c
+++ b/drivers/soc/ti/ti_sci_inta_msi.c
@@ -73,13 +73,13 @@ static int ti_sci_inta_msi_alloc_descs(struct device *dev,
        for (set = 0; set < res->sets; set++) {
                for (i = 0; i < res->desc[set].num; i++, count++) {
                        msi_desc.msi_index = res->desc[set].start + i;
-                       if (msi_add_msi_desc(dev, &msi_desc))
+                       if (msi_insert_msi_desc(dev, &msi_desc))
                                goto fail;
                }
 
                for (i = 0; i < res->desc[set].num_sec; i++, count++) {
                        msi_desc.msi_index = res->desc[set].start_sec + i;
-                       if (msi_add_msi_desc(dev, &msi_desc))
+                       if (msi_insert_msi_desc(dev, &msi_desc))
                                goto fail;
                }
        }

diff --git a/include/linux/msi.h b/include/linux/msi.h
index 764a4e8828fb6dde983ff285f8c7331130ef350e..f8ba85af3542a48c683b3ba41201cf9b03623be8 100644 (file)
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -286,7 +286,7 @@ static inline void msi_desc_set_iommu_cookie(struct msi_desc *desc,
 }
 #endif
 
-int msi_add_msi_desc(struct device *dev, struct msi_desc *init_desc);
+int msi_insert_msi_desc(struct device *dev, struct msi_desc *init_desc);
 void msi_free_msi_descs_range(struct device *dev, unsigned int first_index, unsigned int last_index);
 
 /**

diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c
index e1593c16518bb8c2ba9ac939d1617d9bb45d34ec..33b8a6cca3f8eaf16203bb4bb5148964597a3884 100644 (file)
--- a/kernel/irq/msi.c
+++ b/kernel/irq/msi.c
@@ -77,13 +77,15 @@ static int msi_insert_desc(struct msi_device_data *md, struct msi_desc *desc, un
 }
 
 /**
- * msi_add_msi_desc - Allocate and initialize a MSI descriptor
+ * msi_insert_msi_desc - Allocate and initialize a MSI descriptor and
+ *                      insert it at @init_desc->msi_index
+ *
  * @dev:       Pointer to the device for which the descriptor is allocated
  * @init_desc: Pointer to an MSI descriptor to initialize the new descriptor
  *
  * Return: 0 on success or an appropriate failure code.
  */
-int msi_add_msi_desc(struct device *dev, struct msi_desc *init_desc)
+int msi_insert_msi_desc(struct device *dev, struct msi_desc *init_desc)
 {
        struct msi_desc *desc;