Commit 9a626612 authored by Ian Campbell's avatar Ian Campbell Committed by Konrad Rzeszutek Wilk
Browse files

xen: pci: collapse apic_register_gsi_xen_hvm and xen_hvm_register_pirq 



apic_register_gsi_xen_hvm is a tiny wrapper around
xen_hvm_register_pirq.

Signed-off-by: default avatarIan Campbell <ian.campbell@citrix.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 4b41df7f

arch/x86/pci/xen.c

+3 −8
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
#include <asm/xen/pci.h>



#ifdef CONFIG_ACPI

static int xen_hvm_register_pirq(u32 gsi, int triggering)

static int acpi_register_gsi_xen_hvm(struct device *dev, u32 gsi,

				 int trigger, int polarity)

{

	int rc, irq;

	struct physdev_map_pirq map_irq;
@@ -41,7 +42,7 @@ static int xen_hvm_register_pirq(u32 gsi, int triggering) 
		return -1;

	}



	if (triggering == ACPI_EDGE_SENSITIVE) {

	if (trigger == ACPI_EDGE_SENSITIVE) {

		shareable = 0;

		name = "ioapic-edge";

	} else {
@@ -55,12 +56,6 @@ static int xen_hvm_register_pirq(u32 gsi, int triggering) 


	return irq;

}



static int acpi_register_gsi_xen_hvm(struct device *dev, u32 gsi,

				 int trigger, int polarity)

{

	return xen_hvm_register_pirq(gsi, trigger);

}

#endif



#if defined(CONFIG_PCI_MSI)