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
This commit is contained in:
Thomas Gleixner 2022-11-25 00:24:40 +01:00
parent b330ff9f0b
commit 46a2bc8c70
1 changed files with 3 additions and 22 deletions

View File

@ -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) int fsl_mc_msi_domain_alloc_irqs(struct device *dev, unsigned int irq_count)
{ {
struct irq_domain *msi_domain; int error = msi_setup_device_data(dev);
int error;
msi_domain = dev_get_msi_domain(dev);
if (!msi_domain)
return -EINVAL;
error = msi_setup_device_data(dev);
if (error)
return error;
msi_lock_descs(dev);
if (msi_first_desc(dev, MSI_DESC_ALL))
error = -EINVAL;
msi_unlock_descs(dev);
if (error) if (error)
return 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 * NOTE: Calling this function will trigger the invocation of the
* its_fsl_mc_msi_prepare() callback * 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) if (error)
dev_err(dev, "Failed to allocate IRQs\n"); 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) void fsl_mc_msi_domain_free_irqs(struct device *dev)
{ {
struct irq_domain *msi_domain; msi_domain_free_irqs_all(dev, MSI_DEFAULT_DOMAIN);
msi_domain = dev_get_msi_domain(dev);
if (!msi_domain)
return;
msi_domain_free_irqs(msi_domain, dev);
} }