Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d855fcd authored by Zhang Rui's avatar Zhang Rui Committed by Len Brown
Browse files

ACPI: delete CONFIG_ACPI_PROCFS_POWER and power procfs I/F in 2.6.39 



sysfs I/F for ACPI power devices, including AC and Battery,
has been working in upstream kenrel since 2.6.24, Sep 2007.
In 2.6.37, we made the sysfs I/F always built in and this option
disabled by default.
Now, we plan to remove this option and the ACPI power procfs
interface in 2.6.39.

First, update the feature-removal-schedule to announce this change.
Second, add runtime warnings in ACPI AC/Battery/SBS driver, so that
users will notice this change even if "make oldconfig" is used.

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent cef6e8a3

Documentation/feature-removal-schedule.txt

+11 −0
Original line number Diff line number Diff line
@@ -232,6 +232,17 @@ Who: Zhang Rui <rui.zhang@intel.com> 


---------------------------



What:	CONFIG_ACPI_PROCFS_POWER

When:	2.6.39

Why:	sysfs I/F for ACPI power devices, including AC and Battery,

        has been working in upstream kenrel since 2.6.24, Sep 2007.

	In 2.6.37, we make the sysfs I/F always built in and this option

	disabled by default.

	Remove this option and the ACPI power procfs interface in 2.6.39.

Who:	Zhang Rui <rui.zhang@intel.com>



---------------------------



What:	/proc/acpi/button

When:	August 2007

Why:	/proc/acpi/button has been replaced by events to the input layer

drivers/acpi/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ config ACPI_PROCFS_POWER 
	  /proc/acpi/ac_adapter/* (sys/class/power_supply/*)

	  This option has no effect on /proc/acpi/ directories

	  and functions, which do not yet exist in /sys

	  This option, together with the proc directories, will be

	  deleted in 2.6.39.



	  Say N to delete power /proc/acpi/ directories that have moved to /sys/

drivers/acpi/ac.c

+2 −1
Original line number Diff line number Diff line
@@ -185,7 +185,8 @@ static int acpi_ac_add_fs(struct acpi_device *device) 
{

	struct proc_dir_entry *entry = NULL;





	printk(KERN_WARNING PREFIX "Deprecated procfs I/F for AC is loaded,"

			" please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");

	if (!acpi_device_dir(device)) {

		acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),

						     acpi_ac_dir);

drivers/acpi/battery.c

+2 −0
Original line number Diff line number Diff line
@@ -868,6 +868,8 @@ static int acpi_battery_add_fs(struct acpi_device *device) 
	struct proc_dir_entry *entry = NULL;

	int i;



	printk(KERN_WARNING PREFIX "Deprecated procfs I/F for battery is loaded,"

			" please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");

	if (!acpi_device_dir(device)) {

		acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),

						     acpi_battery_dir);

drivers/acpi/sbs.c

+2 −0
Original line number Diff line number Diff line
@@ -484,6 +484,8 @@ acpi_sbs_add_fs(struct proc_dir_entry **dir, 
		const struct file_operations *state_fops,

		const struct file_operations *alarm_fops, void *data)

{

	printk(KERN_WARNING PREFIX "Deprecated procfs I/F for SBS is loaded,"

			" please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");

	if (!*dir) {

		*dir = proc_mkdir(dir_name, parent_dir);

		if (!*dir) {