Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch 'pci/jiang-pci_slot-kconfig' into next

* pci/jiang-pci_slot-kconfig:
ACPI / PCI: Make pci_slot built-in only, not a module

+8 -16
+1 -4
drivers/acpi/Kconfig
··· 308 308 is about half of the penalty and is rarely useful. 309 309 310 310 config ACPI_PCI_SLOT 311 - tristate "PCI slot detection driver" 311 + bool "PCI slot detection driver" 312 312 depends on SYSFS 313 313 default n 314 314 help ··· 316 316 slots in the system. This can help correlate PCI bus addresses, 317 317 i.e., segment/bus/device/function tuples, with physical slots in 318 318 the system. If you are unsure, say N. 319 - 320 - To compile this driver as a module, choose M here: 321 - the module will be called pci_slot. 322 319 323 320 config X86_PM_TIMER 324 321 bool "Power Management Timer Support" if EXPERT
+5
drivers/acpi/internal.h
··· 67 67 68 68 extern struct acpi_ec *first_ec; 69 69 70 + #ifdef CONFIG_ACPI_PCI_SLOT 71 + void acpi_pci_slot_init(void); 72 + #else 73 + static inline void acpi_pci_slot_init(void) { } 74 + #endif 70 75 int acpi_pci_root_init(void); 71 76 void acpi_pci_root_hp_init(void); 72 77 int acpi_ec_init(void);
+1 -12
drivers/acpi/pci_slot.c
··· 330 330 {} 331 331 }; 332 332 333 - static int __init 334 - acpi_pci_slot_init(void) 333 + void __init acpi_pci_slot_init(void) 335 334 { 336 335 dmi_check_system(acpi_pci_slot_dmi_table); 337 336 acpi_pci_register_driver(&acpi_pci_slot_driver); 338 - return 0; 339 337 } 340 - 341 - static void __exit 342 - acpi_pci_slot_exit(void) 343 - { 344 - acpi_pci_unregister_driver(&acpi_pci_slot_driver); 345 - } 346 - 347 - module_init(acpi_pci_slot_init); 348 - module_exit(acpi_pci_slot_exit);
+1
drivers/acpi/scan.c
··· 1687 1687 1688 1688 acpi_power_init(); 1689 1689 acpi_pci_root_init(); 1690 + acpi_pci_slot_init(); 1690 1691 1691 1692 /* 1692 1693 * Enumerate devices in the ACPI namespace.