Skip to content

Commit

Permalink
xen/pci: Retire unnecessary #ifdef CONFIG_ACPI
Browse files Browse the repository at this point in the history
As the code paths that are guarded by CONFIG_XEN_DOM0 already depend
on CONFIG_ACPI so the extra #ifdef is not required. The earlier
patch that added them in had done its job.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  • Loading branch information
Konrad Rzeszutek Wilk committed Jul 11, 2011
1 parent 9b6519d commit 34b1d12
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions arch/x86/pci/xen.c
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,6 @@ int __init pci_xen_hvm_init(void)
}

#ifdef CONFIG_XEN_DOM0
#ifdef CONFIG_ACPI
static __init void xen_setup_acpi_sci(void)
{
int rc;
Expand Down Expand Up @@ -428,7 +427,6 @@ static __init void xen_setup_acpi_sci(void)

return;
}
#endif

int __init pci_xen_initial_domain(void)
{
Expand All @@ -438,7 +436,6 @@ int __init pci_xen_initial_domain(void)
x86_msi.setup_msi_irqs = xen_initdom_setup_msi_irqs;
x86_msi.teardown_msi_irq = xen_teardown_msi_irq;
#endif
#ifdef CONFIG_ACPI
xen_setup_acpi_sci();
__acpi_register_gsi = acpi_register_gsi_xen;
/* Pre-allocate legacy irqs */
Expand All @@ -452,7 +449,6 @@ int __init pci_xen_initial_domain(void)
trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE,
true /* allocate IRQ */);
}
#endif
if (0 == nr_ioapics) {
for (irq = 0; irq < NR_IRQS_LEGACY; irq++) {
pirq = xen_allocate_pirq_gsi(irq);
Expand Down

0 comments on commit 34b1d12

Please sign in to comment.