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

ACPI: remove CONFIG_ACPI_EC

Remove CONFIG_ACPI_EC. It was always set the same as CONFIG_ACPI,
and it had no menu label, so there was no way to set it to anything
other than "y".

Per section 6.5.4 of the ACPI 3.0b specification,

OSPM must make Embedded Controller operation regions, accessed
via the Embedded Controllers described in ECDT, available before
executing any control method.

The ECDT table is optional, but if it is present, the above text
means that the EC it describes is a required part of the ACPI
subsystem, so CONFIG_ACPI_EC=n wouldn't make sense.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>

authored by

Bjorn Helgaas and committed by
Len Brown
8950d89a fefe5ab3

+6 -21
-8
drivers/acpi/Kconfig
··· 324 324 ACPI Debug Statements slow down ACPI processing. Function trace 325 325 is about half of the penalty and is rarely useful. 326 326 327 - config ACPI_EC 328 - bool 329 - default y 330 - help 331 - This driver is required on some systems for the proper operation of 332 - the battery and thermal drivers. If you are compiling for a 333 - mobile system, say Y. 334 - 335 327 config ACPI_PCI_SLOT 336 328 tristate "PCI slot detection driver" 337 329 default n
+1 -1
drivers/acpi/Makefile
··· 39 39 obj-y += bus.o glue.o 40 40 obj-y += scan.o 41 41 # Keep EC driver first. Initialization of others depend on it. 42 - obj-$(CONFIG_ACPI_EC) += ec.o 42 + obj-y += ec.o 43 43 obj-$(CONFIG_ACPI_AC) += ac.o 44 44 obj-$(CONFIG_ACPI_BATTERY) += battery.o 45 45 obj-$(CONFIG_ACPI_BUTTON) += button.o
+1 -2
drivers/acpi/bus.c
··· 774 774 "Unable to initialize ACPI OS objects\n"); 775 775 goto error1; 776 776 } 777 - #ifdef CONFIG_ACPI_EC 777 + 778 778 /* 779 779 * ACPI 2.0 requires the EC driver to be loaded and work before 780 780 * the EC device is found in the namespace (i.e. before acpi_initialize_objects() ··· 785 785 */ 786 786 status = acpi_ec_ecdt_probe(); 787 787 /* Ignore result. Not having an ECDT is not fatal. */ 788 - #endif 789 788 790 789 status = acpi_initialize_objects(ACPI_FULL_INITIALIZATION); 791 790 if (ACPI_FAILURE(status)) {
+2 -2
drivers/char/sonypi.c
··· 523 523 524 524 static int sonypi_ec_write(u8 addr, u8 value) 525 525 { 526 - #ifdef CONFIG_ACPI_EC 526 + #ifdef CONFIG_ACPI 527 527 if (SONYPI_ACPI_ACTIVE) 528 528 return ec_write(addr, value); 529 529 #endif ··· 539 539 540 540 static int sonypi_ec_read(u8 addr, u8 *value) 541 541 { 542 - #ifdef CONFIG_ACPI_EC 542 + #ifdef CONFIG_ACPI 543 543 if (SONYPI_ACPI_ACTIVE) 544 544 return ec_read(addr, value); 545 545 #endif
+2 -2
drivers/misc/Kconfig
··· 230 230 config MSI_LAPTOP 231 231 tristate "MSI Laptop Extras" 232 232 depends on X86 233 - depends on ACPI_EC 233 + depends on ACPI 234 234 depends on BACKLIGHT_CLASS_DEVICE 235 235 ---help--- 236 236 This is a driver for laptops built by MSI (MICRO-STAR ··· 260 260 config COMPAL_LAPTOP 261 261 tristate "Compal Laptop Extras" 262 262 depends on X86 263 - depends on ACPI_EC 263 + depends on ACPI 264 264 depends on BACKLIGHT_CLASS_DEVICE 265 265 ---help--- 266 266 This is a driver for laptops built by Compal:
-2
include/acpi/acpi_drivers.h
··· 97 97 /* -------------------------------------------------------------------------- 98 98 Embedded Controller 99 99 -------------------------------------------------------------------------- */ 100 - #ifdef CONFIG_ACPI_EC 101 100 int acpi_ec_ecdt_probe(void); 102 101 int acpi_boot_ec_enable(void); 103 - #endif 104 102 105 103 /* -------------------------------------------------------------------------- 106 104 Processor
-4
include/linux/acpi.h
··· 163 163 int acpi_pci_register_driver(struct acpi_pci_driver *driver); 164 164 void acpi_pci_unregister_driver(struct acpi_pci_driver *driver); 165 165 166 - #ifdef CONFIG_ACPI_EC 167 - 168 166 extern int ec_read(u8 addr, u8 *val); 169 167 extern int ec_write(u8 addr, u8 val); 170 168 extern int ec_transaction(u8 command, 171 169 const u8 *wdata, unsigned wdata_len, 172 170 u8 *rdata, unsigned rdata_len, 173 171 int force_poll); 174 - 175 - #endif /*CONFIG_ACPI_EC*/ 176 172 177 173 #if defined(CONFIG_ACPI_WMI) || defined(CONFIG_ACPI_WMI_MODULE) 178 174