bus: fsl-mc-msi: Switch to domain id aware interfaces

Switch to the new domain id aware interfaces to phase out the previous
ones.

Get rid of the MSI descriptor and domain checks as the core code detects
these issues anyway.

No functional change.

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

diff --git a/drivers/bus/fsl-mc/fsl-mc-msi.c b/drivers/bus/fsl-mc/fsl-mc-msi.c
index 0cfe859a4ac4d02cfadb76d14f72f097808d233e..f3f8af9426c9fa237f970044405fcff454f25a78 100644 (file)
--- a/drivers/bus/fsl-mc/fsl-mc-msi.c
+++ b/drivers/bus/fsl-mc/fsl-mc-msi.c
@@ -213,21 +213,8 @@ struct irq_domain *fsl_mc_find_msi_domain(struct device *dev)
 
 int fsl_mc_msi_domain_alloc_irqs(struct device *dev,  unsigned int irq_count)
 {
-       struct irq_domain *msi_domain;
-       int error;
-
-       msi_domain = dev_get_msi_domain(dev);
-       if (!msi_domain)
-               return -EINVAL;
-
-       error = msi_setup_device_data(dev);
-       if (error)
-               return error;
+       int error = msi_setup_device_data(dev);
 
-       msi_lock_descs(dev);
-       if (msi_first_desc(dev, MSI_DESC_ALL))
-               error = -EINVAL;
-       msi_unlock_descs(dev);
        if (error)
                return error;
 
@@ -235,7 +222,7 @@ int fsl_mc_msi_domain_alloc_irqs(struct device *dev,  unsigned int irq_count)
         * NOTE: Calling this function will trigger the invocation of the
         * its_fsl_mc_msi_prepare() callback
         */
-       error = msi_domain_alloc_irqs(msi_domain, dev, irq_count);
+       error = msi_domain_alloc_irqs_range(dev, MSI_DEFAULT_DOMAIN, 0, irq_count - 1);
 
        if (error)
                dev_err(dev, "Failed to allocate IRQs\n");
@@ -244,11 +231,5 @@ int fsl_mc_msi_domain_alloc_irqs(struct device *dev,  unsigned int irq_count)
 
 void fsl_mc_msi_domain_free_irqs(struct device *dev)
 {
-       struct irq_domain *msi_domain;
-
-       msi_domain = dev_get_msi_domain(dev);
-       if (!msi_domain)
-               return;
-
-       msi_domain_free_irqs(msi_domain, dev);
+       msi_domain_free_irqs_all(dev, MSI_DEFAULT_DOMAIN);
 }