Commit 60369a4f authored by Wei Liu's avatar Wei Liu Committed by Bjorn Helgaas
Browse files

x86/PCI: Drop unused xen_register_pirq() gsi_override parameter 

All callers of xen_register_pirq() pass -1 (no override) for the
gsi_override parameter.  Remove it and related code.

Link: https://lore.kernel.org/r/20200428153640.76476-1-wei.liu@kernel.org


Signed-off-by: default avatarWei Liu <wei.liu@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
parent 8f3d9f35

arch/x86/pci/xen.c

+6 −10
Original line number Diff line number Diff line
@@ -60,8 +60,7 @@ static int xen_pcifront_enable_irq(struct pci_dev *dev) 
}



#ifdef CONFIG_ACPI

static int xen_register_pirq(u32 gsi, int gsi_override, int triggering,

			     bool set_pirq)

static int xen_register_pirq(u32 gsi, int triggering, bool set_pirq)

{

	int rc, pirq = -1, irq = -1;

	struct physdev_map_pirq map_irq;
@@ -94,9 +93,6 @@ static int xen_register_pirq(u32 gsi, int gsi_override, int triggering, 
		name = "ioapic-level";

	}



	if (gsi_override >= 0)

		gsi = gsi_override;



	irq = xen_bind_pirq_gsi_to_irq(gsi, map_irq.pirq, shareable, name);

	if (irq < 0)

		goto out;
@@ -112,12 +108,12 @@ static int acpi_register_gsi_xen_hvm(struct device *dev, u32 gsi, 
	if (!xen_hvm_domain())

		return -1;



	return xen_register_pirq(gsi, -1 /* no GSI override */, trigger,

	return xen_register_pirq(gsi, trigger,

				 false /* no mapping of GSI to PIRQ */);

}



#ifdef CONFIG_XEN_DOM0

static int xen_register_gsi(u32 gsi, int gsi_override, int triggering, int polarity)

static int xen_register_gsi(u32 gsi, int triggering, int polarity)

{

	int rc, irq;

	struct physdev_setup_gsi setup_gsi;
@@ -128,7 +124,7 @@ static int xen_register_gsi(u32 gsi, int gsi_override, int triggering, int polar 
	printk(KERN_DEBUG "xen: registering gsi %u triggering %d polarity %d\n",

			gsi, triggering, polarity);



	irq = xen_register_pirq(gsi, gsi_override, triggering, true);

	irq = xen_register_pirq(gsi, triggering, true);



	setup_gsi.gsi = gsi;

	setup_gsi.triggering = (triggering == ACPI_EDGE_SENSITIVE ? 0 : 1);
@@ -148,7 +144,7 @@ static int xen_register_gsi(u32 gsi, int gsi_override, int triggering, int polar 
static int acpi_register_gsi_xen(struct device *dev, u32 gsi,

				 int trigger, int polarity)

{

	return xen_register_gsi(gsi, -1 /* no GSI override */, trigger, polarity);

	return xen_register_gsi(gsi, trigger, polarity);

}

#endif

#endif
@@ -491,7 +487,7 @@ int __init pci_xen_initial_domain(void) 
		if (acpi_get_override_irq(irq, &trigger, &polarity) == -1)

			continue;



		xen_register_pirq(irq, -1 /* no GSI override */,

		xen_register_pirq(irq,

			trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE,

			true /* Map GSI to PIRQ */);

	}