Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6d855fcdd24d2491455527c4999b4d04363f1980

Authored by Zhang Rui
Committed by Len Brown
1 parent cef6e8a379
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

Showing 5 changed files with 19 additions and 1 deletions Side-by-side Diff

Documentation/feature-removal-schedule.txt
Diff comments   View file @ 6d855fc
... ... @@ -232,6 +232,17 @@
232 232  
233 233 ---------------------------
234 234  
  235 +What: CONFIG_ACPI_PROCFS_POWER
  236 +When: 2.6.39
  237 +Why: sysfs I/F for ACPI power devices, including AC and Battery,
  238 + has been working in upstream kenrel since 2.6.24, Sep 2007.
  239 + In 2.6.37, we make the sysfs I/F always built in and this option
  240 + disabled by default.
  241 + Remove this option and the ACPI power procfs interface in 2.6.39.
  242 +Who: Zhang Rui <rui.zhang@intel.com>
  243 +
  244 +---------------------------
  245 +
235 246 What: /proc/acpi/button
236 247 When: August 2007
237 248 Why: /proc/acpi/button has been replaced by events to the input layer
drivers/acpi/Kconfig
Diff comments   View file @ 6d855fc
... ... @@ -70,6 +70,8 @@
70 70 /proc/acpi/ac_adapter/* (sys/class/power_supply/*)
71 71 This option has no effect on /proc/acpi/ directories
72 72 and functions, which do not yet exist in /sys
  73 + This option, together with the proc directories, will be
  74 + deleted in 2.6.39.
73 75  
74 76 Say N to delete power /proc/acpi/ directories that have moved to /sys/
75 77  
... ... @@ -185,7 +185,8 @@
185 185 {
186 186 struct proc_dir_entry *entry = NULL;
187 187  
188   -
  188 + printk(KERN_WARNING PREFIX "Deprecated procfs I/F for AC is loaded,"
  189 + " please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");
189 190 if (!acpi_device_dir(device)) {
190 191 acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
191 192 acpi_ac_dir);
drivers/acpi/battery.c
Diff comments   View file @ 6d855fc
... ... @@ -868,6 +868,8 @@
868 868 struct proc_dir_entry *entry = NULL;
869 869 int i;
870 870  
  871 + printk(KERN_WARNING PREFIX "Deprecated procfs I/F for battery is loaded,"
  872 + " please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");
871 873 if (!acpi_device_dir(device)) {
872 874 acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
873 875 acpi_battery_dir);
... ... @@ -484,6 +484,8 @@
484 484 const struct file_operations *state_fops,
485 485 const struct file_operations *alarm_fops, void *data)
486 486 {
  487 + printk(KERN_WARNING PREFIX "Deprecated procfs I/F for SBS is loaded,"
  488 + " please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");
487 489 if (!*dir) {
488 490 *dir = proc_mkdir(dir_name, parent_dir);
489 491 if (!*dir) {