ACPI : remove CONFIG_ACPI_PROCFS_POWER and AC/Battery procfs I/F

PATCH Applied Zhang Rui 2 participants 3 messages Mar 23, 2011

Subsystems (2)

Documentation ACPI

lore

Share & tools

lore

Zhang Rui

author

2011-03-23 01:34 UTC #0 lore raw

PATCH 1/2 ACPI : remove CONFIG_ACPI_PROCFS_POWER and AC/Battery procfs I/F

Remove CONFIG_ACPI_PROCFS_POWER and the ACPI AC/Battery procfs I/F in 2.6.39.

Signed-off-by Zhang Rui <[email protected]>

---
 Documentation/feature-removal-schedule.txt |   11 
 drivers/acpi/Kconfig                       |   17 -
 drivers/acpi/Makefile                      |    1 
 drivers/acpi/ac.c                          |  128 -----------
 drivers/acpi/battery.c                     |  326 ----------------------------
 drivers/acpi/cm_sbs.c                      |  105 ---------
 drivers/acpi/sbs.c                         |  331 -----------------------------
 7 files changed, 5 insertions(+), 914 deletions(-)

drivers/acpi/Kconfig +0 ~~-17~~

Index: linux-2.6/drivers/acpi/Kconfig
===================================================================
@@ -57,23 +57,6 @@ config ACPI_PROCFS
 
 	  Say N to delete /proc/acpi/ files that have moved to /sys/
 
-config ACPI_PROCFS_POWER
-	bool "Deprecated power /proc/acpi directories"
-	depends on PROC_FS
-	help
-	  For backwards compatibility, this option allows
-          deprecated power /proc/acpi/ directories to exist, even when
-          they have been replaced by functions in /sys.
-          The deprecated directories (and their replacements) include:
-	  /proc/acpi/battery/* (/sys/class/power_supply/*)
-	  /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/
-
 config ACPI_POWER_METER
 	tristate "ACPI 4.0 power meter"
 	depends on HWMON

drivers/acpi/Makefile +0 -1

Index: linux-2.6/drivers/acpi/Makefile
===================================================================
@@ -41,7 +41,6 @@ acpi-y				+= event.o
 acpi-y				+= sysfs.o
 acpi-$(CONFIG_DEBUG_FS)		+= debugfs.o
 acpi-$(CONFIG_ACPI_NUMA)	+= numa.o
-acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o
 ifdef CONFIG_ACPI_VIDEO
 acpi-y				+= video_detect.o
 endif

drivers/acpi/ac.c +2 ~~-126~~

185 lines not on this page · raw message

drivers/acpi/battery.c +2 ~~-324~~

379 lines not on this page · raw message

drivers/acpi/cm_sbs.c deleted +0 ~~-105~~

105 lines not on this page · raw message

drivers/acpi/sbs.c +1 ~~-330~~

399 lines not on this page · raw message

Documentation/feature-removal-schedule.txt +0 ~~-11~~

Index: linux-2.6/Documentation/feature-removal-schedule.txt
===================================================================
@@ -248,17 +248,6 @@ Who:	Zhang Rui <[email protected]>
 
 ---------------------------
 
-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 <[email protected]>
-
----------------------------
-
 What:	/proc/acpi/button
 When:	August 2007
 Why:	/proc/acpi/button has been replaced by events to the input layer

Len Brown

reviewer

2011-03-23 03:23 UTC #1 lore raw

Quoted 9 lines

Documentation/feature-removal-schedule.txt |   11 
drivers/acpi/Kconfig                       |   17 -
drivers/acpi/Makefile                      |    1 
drivers/acpi/ac.c                          |  128 
drivers/acpi/battery.c                     |  326 
drivers/acpi/cm_sbs.c                      |  105 ---------
drivers/acpi/sbs.c                         |  331

7 files changed, 5 insertions(+), 914 deletions(-)

Do the popular battery applets know how to use sysfs? We can't delete this code until they do.

thanks,
Len Brown, Intel Open Source Technology Center

Zhang, Rui

author

2011-03-23 05:35 UTC #2 lore raw

Quoted 20 lines

-----Original Message-----
From: [email protected] [mailto:linux-acpi- [email protected]] On Behalf Of Len Brown
Sent: Wednesday, March 23, 2011 11:24 AM
To: Zhang, Rui
Cc: [email protected]
Subject: Re: [PATCH 1/2] ACPI : remove CONFIG_ACPI_PROCFS_POWER and AC/Battery procfs I/F
Importance: High
Quoted 8 lines
Documentation/feature-removal-schedule.txt |   11
drivers/acpi/Kconfig                       |   17 -
drivers/acpi/Makefile                      |    1
drivers/acpi/ac.c                          |  128
drivers/acpi/battery.c                     |  326
drivers/acpi/cm_sbs.c                      |  105 ---------
drivers/acpi/sbs.c                         |  331

Quoted 5 lines

Quoted 1 line
7 files changed, 5 insertions(+), 914 deletions(-)
Do the popular battery applets know how to use sysfs? We can't delete this code until they do.

[Rui] I'm not quite sure.
But CONFIG_ACPI_PROCFS_POWER has been set to n by default for some days. And we announced to remove this interface in 2.6.39.

Thanks,
Rui

Quoted 8 lines

thanks,
Len Brown, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html