aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-11-05 18:18:03 -0500
committerLen Brown <len.brown@intel.com>2008-11-06 15:52:28 -0500
commit8950d89acaa8c353869e681772479d7955ae6f7a (patch)
tree0e434e795f1b6cf1c1edb6df284cdc8bc62248c8
parentfefe5ab3d67b0ade6200fec5ed6f2812cbcbb658 (diff)
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>
-rw-r--r--drivers/acpi/Kconfig8
-rw-r--r--drivers/acpi/Makefile2
-rw-r--r--drivers/acpi/bus.c3
-rw-r--r--drivers/char/sonypi.c4
-rw-r--r--drivers/misc/Kconfig4
-rw-r--r--include/acpi/acpi_drivers.h2
-rw-r--r--include/linux/acpi.h4
7 files changed, 6 insertions, 21 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 4fa7866a9a5e..90cb2a823b56 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -324,14 +324,6 @@ config ACPI_DEBUG_FUNC_TRACE
324 ACPI Debug Statements slow down ACPI processing. Function trace 324 ACPI Debug Statements slow down ACPI processing. Function trace
325 is about half of the penalty and is rarely useful. 325 is about half of the penalty and is rarely useful.
326 326
327config 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
335config ACPI_PCI_SLOT 327config ACPI_PCI_SLOT
336 tristate "PCI slot detection driver" 328 tristate "PCI slot detection driver"
337 default n 329 default n
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 8017f63920c4..fc622316a7d8 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -39,7 +39,7 @@ obj-y += sleep/
39obj-y += bus.o glue.o 39obj-y += bus.o glue.o
40obj-y += scan.o 40obj-y += scan.o
41# Keep EC driver first. Initialization of others depend on it. 41# Keep EC driver first. Initialization of others depend on it.
42obj-$(CONFIG_ACPI_EC) += ec.o 42obj-y += ec.o
43obj-$(CONFIG_ACPI_AC) += ac.o 43obj-$(CONFIG_ACPI_AC) += ac.o
44obj-$(CONFIG_ACPI_BATTERY) += battery.o 44obj-$(CONFIG_ACPI_BATTERY) += battery.o
45obj-$(CONFIG_ACPI_BUTTON) += button.o 45obj-$(CONFIG_ACPI_BUTTON) += button.o
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index c797c6473f31..765fd1c56cd6 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -774,7 +774,7 @@ static int __init acpi_bus_init(void)
774 "Unable to initialize ACPI OS objects\n"); 774 "Unable to initialize ACPI OS objects\n");
775 goto error1; 775 goto error1;
776 } 776 }
777#ifdef CONFIG_ACPI_EC 777
778 /* 778 /*
779 * ACPI 2.0 requires the EC driver to be loaded and work before 779 * ACPI 2.0 requires the EC driver to be loaded and work before
780 * the EC device is found in the namespace (i.e. before acpi_initialize_objects() 780 * the EC device is found in the namespace (i.e. before acpi_initialize_objects()
@@ -785,7 +785,6 @@ static int __init acpi_bus_init(void)
785 */ 785 */
786 status = acpi_ec_ecdt_probe(); 786 status = acpi_ec_ecdt_probe();
787 /* Ignore result. Not having an ECDT is not fatal. */ 787 /* Ignore result. Not having an ECDT is not fatal. */
788#endif
789 788
790 status = acpi_initialize_objects(ACPI_FULL_INITIALIZATION); 789 status = acpi_initialize_objects(ACPI_FULL_INITIALIZATION);
791 if (ACPI_FAILURE(status)) { 790 if (ACPI_FAILURE(status)) {
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 85e0eb76eeab..1b128d1e2150 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -523,7 +523,7 @@ static int acpi_driver_registered;
523 523
524static int sonypi_ec_write(u8 addr, u8 value) 524static int sonypi_ec_write(u8 addr, u8 value)
525{ 525{
526#ifdef CONFIG_ACPI_EC 526#ifdef CONFIG_ACPI
527 if (SONYPI_ACPI_ACTIVE) 527 if (SONYPI_ACPI_ACTIVE)
528 return ec_write(addr, value); 528 return ec_write(addr, value);
529#endif 529#endif
@@ -539,7 +539,7 @@ static int sonypi_ec_write(u8 addr, u8 value)
539 539
540static int sonypi_ec_read(u8 addr, u8 *value) 540static int sonypi_ec_read(u8 addr, u8 *value)
541{ 541{
542#ifdef CONFIG_ACPI_EC 542#ifdef CONFIG_ACPI
543 if (SONYPI_ACPI_ACTIVE) 543 if (SONYPI_ACPI_ACTIVE)
544 return ec_read(addr, value); 544 return ec_read(addr, value);
545#endif 545#endif
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 9494400e8fd0..4494ad27cbf1 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -230,7 +230,7 @@ config HP_WMI
230config MSI_LAPTOP 230config MSI_LAPTOP
231 tristate "MSI Laptop Extras" 231 tristate "MSI Laptop Extras"
232 depends on X86 232 depends on X86
233 depends on ACPI_EC 233 depends on ACPI
234 depends on BACKLIGHT_CLASS_DEVICE 234 depends on BACKLIGHT_CLASS_DEVICE
235 ---help--- 235 ---help---
236 This is a driver for laptops built by MSI (MICRO-STAR 236 This is a driver for laptops built by MSI (MICRO-STAR
@@ -260,7 +260,7 @@ config PANASONIC_LAPTOP
260config COMPAL_LAPTOP 260config COMPAL_LAPTOP
261 tristate "Compal Laptop Extras" 261 tristate "Compal Laptop Extras"
262 depends on X86 262 depends on X86
263 depends on ACPI_EC 263 depends on ACPI
264 depends on BACKLIGHT_CLASS_DEVICE 264 depends on BACKLIGHT_CLASS_DEVICE
265 ---help--- 265 ---help---
266 This is a driver for laptops built by Compal: 266 This is a driver for laptops built by Compal:
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index 818215f89e7a..b3c40dc9d6ba 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -97,10 +97,8 @@ extern int acpi_power_nocheck;
97/* -------------------------------------------------------------------------- 97/* --------------------------------------------------------------------------
98 Embedded Controller 98 Embedded Controller
99 -------------------------------------------------------------------------- */ 99 -------------------------------------------------------------------------- */
100#ifdef CONFIG_ACPI_EC
101int acpi_ec_ecdt_probe(void); 100int acpi_ec_ecdt_probe(void);
102int acpi_boot_ec_enable(void); 101int acpi_boot_ec_enable(void);
103#endif
104 102
105/* -------------------------------------------------------------------------- 103/* --------------------------------------------------------------------------
106 Processor 104 Processor
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index fd6a452b0ceb..d7846bdd2721 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -163,8 +163,6 @@ struct acpi_pci_driver {
163int acpi_pci_register_driver(struct acpi_pci_driver *driver); 163int acpi_pci_register_driver(struct acpi_pci_driver *driver);
164void acpi_pci_unregister_driver(struct acpi_pci_driver *driver); 164void acpi_pci_unregister_driver(struct acpi_pci_driver *driver);
165 165
166#ifdef CONFIG_ACPI_EC
167
168extern int ec_read(u8 addr, u8 *val); 166extern int ec_read(u8 addr, u8 *val);
169extern int ec_write(u8 addr, u8 val); 167extern int ec_write(u8 addr, u8 val);
170extern int ec_transaction(u8 command, 168extern int ec_transaction(u8 command,
@@ -172,8 +170,6 @@ extern int ec_transaction(u8 command,
172 u8 *rdata, unsigned rdata_len, 170 u8 *rdata, unsigned rdata_len,
173 int force_poll); 171 int force_poll);
174 172
175#endif /*CONFIG_ACPI_EC*/
176
177#if defined(CONFIG_ACPI_WMI) || defined(CONFIG_ACPI_WMI_MODULE) 173#if defined(CONFIG_ACPI_WMI) || defined(CONFIG_ACPI_WMI_MODULE)
178 174
179typedef void (*wmi_notify_handler) (u32 value, void *context); 175typedef void (*wmi_notify_handler) (u32 value, void *context);