Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d32a665 authored by Sinan Kaya's avatar Sinan Kaya Committed by Rafael J. Wysocki
Browse files

PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set 



We are compiling PCI code today for systems with ACPI and no PCI
device present. Remove the useless code and reduce the tight
dependency.

Signed-off-by: default avatarSinan Kaya <okaya@kernel.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com> # PCI parts
Acked-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent bd23fac3

arch/x86/include/asm/pci_x86.h

+7 −0
Original line number Diff line number Diff line
@@ -121,7 +121,14 @@ extern void __init dmi_check_pciprobe(void); 
extern void __init dmi_check_skip_isa_align(void);



/* some common used subsys_initcalls */

#ifdef CONFIG_PCI

extern int __init pci_acpi_init(void);

#else

static inline int  __init pci_acpi_init(void)

{

	return -EINVAL;

}

#endif

extern void __init pcibios_irq_init(void);

extern int __init pcibios_init(void);

extern int pci_legacy_init(void);

drivers/acpi/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ config ARCH_SUPPORTS_ACPI 
menuconfig ACPI

	bool "ACPI (Advanced Configuration and Power Interface) Support"

	depends on ARCH_SUPPORTS_ACPI

	depends on PCI

	select PNP

	default y if X86

	help

drivers/acpi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ acpi-y += processor_core.o 
acpi-$(CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC) += processor_pdc.o

acpi-y				+= ec.o

acpi-$(CONFIG_ACPI_DOCK)	+= dock.o

acpi-y				+= pci_root.o pci_link.o pci_irq.o

acpi-$(CONFIG_PCI)		+= pci_root.o pci_link.o pci_irq.o

obj-$(CONFIG_ACPI_MCFG)		+= pci_mcfg.o

acpi-y				+= acpi_lpss.o acpi_apd.o

acpi-y				+= acpi_platform.o

drivers/acpi/internal.h

+5 −0
Original line number Diff line number Diff line
@@ -25,8 +25,13 @@ int acpi_osi_init(void); 
acpi_status acpi_os_initialize1(void);

void init_acpi_device_notify(void);

int acpi_scan_init(void);

#ifdef CONFIG_PCI

void acpi_pci_root_init(void);

void acpi_pci_link_init(void);

#else

static inline void acpi_pci_root_init(void) {}

static inline void acpi_pci_link_init(void) {}

#endif

void acpi_processor_init(void);

void acpi_platform_init(void);

void acpi_pnp_init(void);

drivers/pci/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ ifdef CONFIG_PCI 
obj-$(CONFIG_PROC_FS)		+= proc.o

obj-$(CONFIG_SYSFS)		+= slot.o

obj-$(CONFIG_OF)		+= of.o

obj-$(CONFIG_ACPI)		+= pci-acpi.o

endif



obj-$(CONFIG_PCI_QUIRKS)	+= quirks.o
@@ -20,7 +21,6 @@ obj-$(CONFIG_PCI_MSI) += msi.o 
obj-$(CONFIG_PCI_ATS)		+= ats.o

obj-$(CONFIG_PCI_IOV)		+= iov.o

obj-$(CONFIG_PCI_BRIDGE_EMUL)	+= pci-bridge-emul.o

obj-$(CONFIG_ACPI)		+= pci-acpi.o

obj-$(CONFIG_PCI_LABEL)		+= pci-label.o

obj-$(CONFIG_X86_INTEL_MID)	+= pci-mid.o

obj-$(CONFIG_PCI_SYSCALL)	+= syscall.o