Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 699c4cec authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Bjorn Helgaas
Browse files

PCI/MSI: Remove pci_msi_domain_{alloc,free}_irqs() 



Just call the msi_* version directly instead of having trivial wrappers for
one or two callsites.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 47feb418

arch/x86/kernel/apic/msi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -82,7 +82,7 @@ int native_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) 
	if (domain == NULL)

	if (domain == NULL)

		return -ENOSYS;

		return -ENOSYS;





	return pci_msi_domain_alloc_irqs(domain, dev, nvec, type);

	return msi_domain_alloc_irqs(domain, &dev->dev, nvec);

}

}





void native_teardown_msi_irq(unsigned int irq)

void native_teardown_msi_irq(unsigned int irq)

drivers/pci/msi.c

+2 −28
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ static int pci_msi_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) 




	domain = dev_get_msi_domain(&dev->dev);

	domain = dev_get_msi_domain(&dev->dev);

	if (domain && irq_domain_is_hierarchy(domain))

	if (domain && irq_domain_is_hierarchy(domain))

		return pci_msi_domain_alloc_irqs(domain, dev, nvec, type);

		return msi_domain_alloc_irqs(domain, &dev->dev, nvec);





	return arch_setup_msi_irqs(dev, nvec, type);

	return arch_setup_msi_irqs(dev, nvec, type);

}

}
@@ -49,7 +49,7 @@ static void pci_msi_teardown_msi_irqs(struct pci_dev *dev) 




	domain = dev_get_msi_domain(&dev->dev);

	domain = dev_get_msi_domain(&dev->dev);

	if (domain && irq_domain_is_hierarchy(domain))

	if (domain && irq_domain_is_hierarchy(domain))

		pci_msi_domain_free_irqs(domain, dev);

		msi_domain_free_irqs(domain, &dev->dev);

	else

	else

		arch_teardown_msi_irqs(dev);

		arch_teardown_msi_irqs(dev);

}

}
@@ -1454,32 +1454,6 @@ struct irq_domain *pci_msi_create_irq_domain(struct fwnode_handle *fwnode, 
}

}

EXPORT_SYMBOL_GPL(pci_msi_create_irq_domain);

EXPORT_SYMBOL_GPL(pci_msi_create_irq_domain);





/**

 * pci_msi_domain_alloc_irqs - Allocate interrupts for @dev in @domain

 * @domain:	The interrupt domain to allocate from

 * @dev:	The device for which to allocate

 * @nvec:	The number of interrupts to allocate

 * @type:	Unused to allow simpler migration from the arch_XXX interfaces

 *

 * Returns:

 * A virtual interrupt number or an error code in case of failure

 */

int pci_msi_domain_alloc_irqs(struct irq_domain *domain, struct pci_dev *dev,

			      int nvec, int type)

{

	return msi_domain_alloc_irqs(domain, &dev->dev, nvec);

}



/**

 * pci_msi_domain_free_irqs - Free interrupts for @dev in @domain

 * @domain:	The interrupt domain

 * @dev:	The device for which to free interrupts

 */

void pci_msi_domain_free_irqs(struct irq_domain *domain, struct pci_dev *dev)

{

	msi_domain_free_irqs(domain, &dev->dev);

}



static int get_msi_id_cb(struct pci_dev *pdev, u16 alias, void *data)

static int get_msi_id_cb(struct pci_dev *pdev, u16 alias, void *data)

{

{

	u32 *pa = data;

	u32 *pa = data;

include/linux/msi.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -316,9 +316,6 @@ void pci_msi_domain_write_msg(struct irq_data *irq_data, struct msi_msg *msg); 
struct irq_domain *pci_msi_create_irq_domain(struct fwnode_handle *fwnode,

struct irq_domain *pci_msi_create_irq_domain(struct fwnode_handle *fwnode,

					     struct msi_domain_info *info,

					     struct msi_domain_info *info,

					     struct irq_domain *parent);

					     struct irq_domain *parent);

int pci_msi_domain_alloc_irqs(struct irq_domain *domain, struct pci_dev *dev,

			      int nvec, int type);

void pci_msi_domain_free_irqs(struct irq_domain *domain, struct pci_dev *dev);

irq_hw_number_t pci_msi_domain_calc_hwirq(struct pci_dev *dev,

irq_hw_number_t pci_msi_domain_calc_hwirq(struct pci_dev *dev,

					  struct msi_desc *desc);

					  struct msi_desc *desc);

int pci_msi_domain_check_cap(struct irq_domain *domain,

int pci_msi_domain_check_cap(struct irq_domain *domain,