Commit c459f11f authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

genirq/msi: Remove unused alloc/free interfaces 



Now that all users are converted remove the old interfaces.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Acked-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20221124230314.694291814@linutronix.de
parent 811b3281

include/linux/msi.h

+0 −7
Original line number Diff line number Diff line
@@ -487,13 +487,6 @@ int msi_domain_set_affinity(struct irq_data *data, const struct cpumask *mask, 
struct irq_domain *msi_create_irq_domain(struct fwnode_handle *fwnode,

					 struct msi_domain_info *info,

					 struct irq_domain *parent);

int msi_domain_alloc_irqs_descs_locked(struct irq_domain *domain, struct device *dev,

				       int nvec);

int msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev,

			  int nvec);



void msi_domain_free_irqs_descs_locked(struct irq_domain *domain, struct device *dev);

void msi_domain_free_irqs(struct irq_domain *domain, struct device *dev);



int msi_domain_alloc_irqs_range_locked(struct device *dev, unsigned int domid,

				       unsigned int first, unsigned int last);

kernel/irq/msi.c

+0 −73
Original line number Diff line number Diff line
@@ -1140,51 +1140,6 @@ int msi_domain_alloc_irqs_all_locked(struct device *dev, unsigned int domid, int 
	return msi_domain_alloc_locked(dev, &ctrl);

}



/**

 * msi_domain_alloc_irqs_descs_locked - Allocate interrupts from a MSI interrupt domain

 * @domain:	The domain to allocate from

 * @dev:	Pointer to device struct of the device for which the interrupts

 *		are allocated

 * @nvec:	The number of interrupts to allocate

 *

 * Must be invoked from within a msi_lock_descs() / msi_unlock_descs()

 * pair. Use this for MSI irqdomains which implement their own vector

 * allocation/free.

 *

 * Return: %0 on success or an error code.

 */

int msi_domain_alloc_irqs_descs_locked(struct irq_domain *domain, struct device *dev,

				       int nvec)

{

	struct msi_ctrl ctrl = {

		.domid	= MSI_DEFAULT_DOMAIN,

		.first	= 0,

		.last	= MSI_MAX_INDEX,

		.nirqs	= nvec,

	};



	return msi_domain_alloc_locked(dev, &ctrl);

}



/**

 * msi_domain_alloc_irqs - Allocate interrupts from a MSI interrupt domain

 * @domain:	The domain to allocate from

 * @dev:	Pointer to device struct of the device for which the interrupts

 *		are allocated

 * @nvec:	The number of interrupts to allocate

 *

 * Return: %0 on success or an error code.

 */

int msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev, int nvec)

{

	int ret;



	msi_lock_descs(dev);

	ret = msi_domain_alloc_irqs_descs_locked(domain, dev, nvec);

	msi_unlock_descs(dev);

	return ret;

}



static void __msi_domain_free_irqs(struct device *dev, struct irq_domain *domain,

				   struct msi_ctrl *ctrl)

{
@@ -1309,34 +1264,6 @@ void msi_domain_free_irqs_all(struct device *dev, unsigned int domid) 
	msi_unlock_descs(dev);

}



/**

 * msi_domain_free_irqs_descs_locked - Free interrupts from a MSI interrupt @domain associated to @dev

 * @domain:	The domain to managing the interrupts

 * @dev:	Pointer to device struct of the device for which the interrupts

 *		are free

 *

 * Must be invoked from within a msi_lock_descs() / msi_unlock_descs()

 * pair. Use this for MSI irqdomains which implement their own vector

 * allocation.

 */

void msi_domain_free_irqs_descs_locked(struct irq_domain *domain, struct device *dev)

{

	msi_domain_free_irqs_range_locked(dev, MSI_DEFAULT_DOMAIN, 0, MSI_MAX_INDEX);

}



/**

 * msi_domain_free_irqs - Free interrupts from a MSI interrupt @domain associated to @dev

 * @domain:	The domain to managing the interrupts

 * @dev:	Pointer to device struct of the device for which the interrupts

 *		are free

 */

void msi_domain_free_irqs(struct irq_domain *domain, struct device *dev)

{

	msi_lock_descs(dev);

	msi_domain_free_irqs_descs_locked(domain, dev);

	msi_unlock_descs(dev);

}



/**

 * msi_get_domain_info - Get the MSI interrupt domain info for @domain

 * @domain:	The interrupt domain to retrieve data from