UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ACPI / PCI: Make pci_slot built-in only, not a module 

As discussed in thread at https://patchwork.kernel.org/patch/1946851/,
there's no value in supporting CONFIG_ACPI_PCI_SLOT=m any more.
So change Kconfig and code to only support building pci_slot as
built-in driver.

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Jiang Liu 2013-01-19 00:07:42 +08:00 committed by Bjorn Helgaas
parent a2766602ac
commit ab1a2e038f
4 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/acpi/Kconfig
View File

@ -308,7 +308,7 @@ config ACPI_DEBUG_FUNC_TRACE
is about half of the penalty and is rarely useful. is about half of the penalty and is rarely useful.
config ACPI_PCI_SLOT config ACPI_PCI_SLOT
tristate "PCI slot detection driver" bool "PCI slot detection driver"
depends on SYSFS depends on SYSFS
default n default n
help help
@ -317,9 +317,6 @@ config ACPI_PCI_SLOT
i.e., segment/bus/device/function tuples, with physical slots in i.e., segment/bus/device/function tuples, with physical slots in
the system. If you are unsure, say N. the system. If you are unsure, say N.
To compile this driver as a module, choose M here:
the module will be called pci_slot.
config X86_PM_TIMER config X86_PM_TIMER
bool "Power Management Timer Support" if EXPERT bool "Power Management Timer Support" if EXPERT
depends on X86 depends on X86

5
drivers/acpi/internal.h
View File

@ -67,6 +67,11 @@ struct acpi_ec {
extern struct acpi_ec *first_ec; extern struct acpi_ec *first_ec;
#ifdef CONFIG_ACPI_PCI_SLOT
void acpi_pci_slot_init(void);
#else
static inline void acpi_pci_slot_init(void) { }
#endif
int acpi_pci_root_init(void); int acpi_pci_root_init(void);
int acpi_ec_init(void); int acpi_ec_init(void);
int acpi_ec_ecdt_probe(void); int acpi_ec_ecdt_probe(void);

13
drivers/acpi/pci_slot.c
View File

@ -330,19 +330,8 @@ static struct dmi_system_id acpi_pci_slot_dmi_table[] __initdata = {
{} {}
}; };
static int __init void __init acpi_pci_slot_init(void)
acpi_pci_slot_init(void)
{ {
dmi_check_system(acpi_pci_slot_dmi_table); dmi_check_system(acpi_pci_slot_dmi_table);
acpi_pci_register_driver(&acpi_pci_slot_driver); acpi_pci_register_driver(&acpi_pci_slot_driver);
return 0;
} }
static void __exit
acpi_pci_slot_exit(void)
{
acpi_pci_unregister_driver(&acpi_pci_slot_driver);
}
module_init(acpi_pci_slot_init);
module_exit(acpi_pci_slot_exit);

1
drivers/acpi/scan.c
View File

@ -1687,6 +1687,7 @@ int __init acpi_scan_init(void)
acpi_power_init(); acpi_power_init();
acpi_pci_root_init(); acpi_pci_root_init();
acpi_pci_slot_init();
/* /*
* Enumerate devices in the ACPI namespace. * Enumerate devices in the ACPI namespace.