Commit 5611712a authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/controller/hv' 

- Remove unused hv_msi_free() parameter (Nam Cao)

* pci/controller/hv:
  PCI: hv: Remove unused parameter of hv_msi_free()
parents 0a09e231 ce47f819

drivers/pci/controller/pci-hyperv.c

+2 −6
Original line number Diff line number Diff line
@@ -1680,7 +1680,6 @@ static void hv_int_desc_free(struct hv_pci_dev *hpdev, 
/**

 * hv_msi_free() - Free the MSI.

 * @domain:	The interrupt domain pointer

 * @info:	Extra MSI-related context

 * @irq:	Identifies the IRQ.

 *

 * The Hyper-V parent partition and hypervisor are tracking the
@@ -1688,8 +1687,7 @@ static void hv_int_desc_free(struct hv_pci_dev *hpdev, 
 * table up to date.  This callback sends a message that frees

 * the IRT entry and related tracking nonsense.

 */

static void hv_msi_free(struct irq_domain *domain, struct msi_domain_info *info,

			unsigned int irq)

static void hv_msi_free(struct irq_domain *domain, unsigned int irq)

{

	struct hv_pcibus_device *hbus;

	struct hv_pci_dev *hpdev;
@@ -2181,10 +2179,8 @@ static int hv_pcie_domain_alloc(struct irq_domain *d, unsigned int virq, unsigne 


static void hv_pcie_domain_free(struct irq_domain *d, unsigned int virq, unsigned int nr_irqs)

{

	struct msi_domain_info *info = d->host_data;



	for (int i = 0; i < nr_irqs; i++)

		hv_msi_free(d, info, virq + i);

		hv_msi_free(d, virq + i);



	irq_domain_free_irqs_top(d, virq, nr_irqs);

}