Commit 8950d89a authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

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: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Acked-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent fefe5ab3

drivers/acpi/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -324,14 +324,6 @@ config ACPI_DEBUG_FUNC_TRACE 
	  ACPI Debug Statements slow down ACPI processing. Function trace

	  is about half of the penalty and is rarely useful.



config ACPI_EC

	bool

	default y

	help

	  This driver is required on some systems for the proper operation of

	  the battery and thermal drivers.  If you are compiling for a 

	  mobile system, say Y.



config ACPI_PCI_SLOT

	tristate "PCI slot detection driver"

	default n

drivers/acpi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ obj-y += sleep/ 
obj-y				+= bus.o glue.o

obj-y				+= scan.o

# Keep EC driver first. Initialization of others depend on it.

obj-$(CONFIG_ACPI_EC)		+= ec.o

obj-y				+= ec.o

obj-$(CONFIG_ACPI_AC) 		+= ac.o

obj-$(CONFIG_ACPI_BATTERY)	+= battery.o

obj-$(CONFIG_ACPI_BUTTON)	+= button.o

drivers/acpi/bus.c

+1 −2
Original line number Diff line number Diff line
@@ -774,7 +774,7 @@ static int __init acpi_bus_init(void) 
		       "Unable to initialize ACPI OS objects\n");

		goto error1;

	}

#ifdef CONFIG_ACPI_EC



	/*

	 * ACPI 2.0 requires the EC driver to be loaded and work before

	 * 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) 
	 */

	status = acpi_ec_ecdt_probe();

	/* Ignore result. Not having an ECDT is not fatal. */

#endif



	status = acpi_initialize_objects(ACPI_FULL_INITIALIZATION);

	if (ACPI_FAILURE(status)) {

drivers/char/sonypi.c

+2 −2
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ static int acpi_driver_registered; 


static int sonypi_ec_write(u8 addr, u8 value)

{

#ifdef CONFIG_ACPI_EC

#ifdef CONFIG_ACPI

	if (SONYPI_ACPI_ACTIVE)

		return ec_write(addr, value);

#endif
@@ -539,7 +539,7 @@ static int sonypi_ec_write(u8 addr, u8 value) 


static int sonypi_ec_read(u8 addr, u8 *value)

{

#ifdef CONFIG_ACPI_EC

#ifdef CONFIG_ACPI

	if (SONYPI_ACPI_ACTIVE)

		return ec_read(addr, value);

#endif

drivers/misc/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ config HP_WMI 
config MSI_LAPTOP

        tristate "MSI Laptop Extras"

        depends on X86

        depends on ACPI_EC

        depends on ACPI

        depends on BACKLIGHT_CLASS_DEVICE

        ---help---

	  This is a driver for laptops built by MSI (MICRO-STAR
@@ -260,7 +260,7 @@ config PANASONIC_LAPTOP 
config COMPAL_LAPTOP

	tristate "Compal Laptop Extras"

	depends on X86

	depends on ACPI_EC

	depends on ACPI

	depends on BACKLIGHT_CLASS_DEVICE

	---help---

	  This is a driver for laptops built by Compal:

CRA Git | Maintained and supported by SUSTech CRA and CCSE