Skip to content

Commit 5611712

Browse files
committed
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()
2 parents 0a09e23 + ce47f81 commit 5611712

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

drivers/pci/controller/pci-hyperv.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1680,16 +1680,14 @@ static void hv_int_desc_free(struct hv_pci_dev *hpdev,
16801680
/**
16811681
* hv_msi_free() - Free the MSI.
16821682
* @domain: The interrupt domain pointer
1683-
* @info: Extra MSI-related context
16841683
* @irq: Identifies the IRQ.
16851684
*
16861685
* The Hyper-V parent partition and hypervisor are tracking the
16871686
* messages that are in use, keeping the interrupt redirection
16881687
* table up to date. This callback sends a message that frees
16891688
* the IRT entry and related tracking nonsense.
16901689
*/
1691-
static void hv_msi_free(struct irq_domain *domain, struct msi_domain_info *info,
1692-
unsigned int irq)
1690+
static void hv_msi_free(struct irq_domain *domain, unsigned int irq)
16931691
{
16941692
struct hv_pcibus_device *hbus;
16951693
struct hv_pci_dev *hpdev;
@@ -2181,10 +2179,8 @@ static int hv_pcie_domain_alloc(struct irq_domain *d, unsigned int virq, unsigne
21812179

21822180
static void hv_pcie_domain_free(struct irq_domain *d, unsigned int virq, unsigned int nr_irqs)
21832181
{
2184-
struct msi_domain_info *info = d->host_data;
2185-
21862182
for (int i = 0; i < nr_irqs; i++)
2187-
hv_msi_free(d, info, virq + i);
2183+
hv_msi_free(d, virq + i);
21882184

21892185
irq_domain_free_irqs_top(d, virq, nr_irqs);
21902186
}

0 commit comments

Comments
 (0)