[ACPI] Deprecate /proc/acpi/sleep in favor of /sys/power/state

Signed-off-by: Len Brown <len.brown@intel.com>

2 files changed, 17 insertions, 0 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index fa7f43451891..8b6de1462558 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -80,6 +80,14 @@ config ACPI_SLEEP_PROC_FS
         depends on ACPI_SLEEP && PROC_FS
         default y
 
+config ACPI_SLEEP_PROC_SLEEP
+        bool "/proc/acpi/sleep (deprecated)"
+        depends on ACPI_SLEEP_PROC_FS
+        default n
+        ---help---
+          Create /proc/acpi/sleep
+          Deprecated by /sys/power/state
+
 config ACPI_AC
         tristate "AC Adapter"
         depends on X86
diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c
index fd7c5a0649af..1be99f0996d6 100644
--- a/drivers/acpi/sleep/proc.c
+++ b/drivers/acpi/sleep/proc.c
@@ -13,13 +13,17 @@
 
 #include "sleep.h"
 
+#ifdef  CONFIG_ACPI_SLEEP_PROC_SLEEP
 #define ACPI_SYSTEM_FILE_SLEEP          "sleep"
+#endif
+
 #define ACPI_SYSTEM_FILE_ALARM          "alarm"
 #define ACPI_SYSTEM_FILE_WAKEUP_DEVICE   "wakeup"
 
 #define _COMPONENT              ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME                ("sleep")
 
+#ifdef  CONFIG_ACPI_SLEEP_PROC_SLEEP
 
 static int acpi_system_sleep_seq_show(struct seq_file *seq, void *offset)
 {
@@ -78,6 +82,7 @@ acpi_system_write_sleep (
  Done:
         return error ? error : count;
 }
+#endif  /* CONFIG_ACPI_SLEEP_PROC_SLEEP */
 
 static int acpi_system_alarm_seq_show(struct seq_file *seq, void *offset)
 {
@@ -452,6 +457,7 @@ static struct file_operations acpi_system_wakeup_device_fops = {
         .release        = single_release,
 };
 
+#ifdef  CONFIG_ACPI_SLEEP_PROC_SLEEP
 static struct file_operations acpi_system_sleep_fops = {
         .open           = acpi_system_sleep_open_fs,
         .read           = seq_read,
@@ -459,6 +465,7 @@ static struct file_operations acpi_system_sleep_fops = {
         .llseek         = seq_lseek,
         .release        = single_release,
 };
+#endif  /* CONFIG_ACPI_SLEEP_PROC_SLEEP */
 
 static struct file_operations acpi_system_alarm_fops = {
         .open           = acpi_system_alarm_open_fs,
@@ -484,11 +491,13 @@ static int acpi_sleep_proc_init(void)
         if (acpi_disabled)
                 return 0;
  
+#ifdef  CONFIG_ACPI_SLEEP_PROC_SLEEP
         /* 'sleep' [R/W]*/
         entry = create_proc_entry(ACPI_SYSTEM_FILE_SLEEP,
                                   S_IFREG|S_IRUGO|S_IWUSR, acpi_root_dir);
         if (entry)
                 entry->proc_fops = &acpi_system_sleep_fops;
+#endif
 
         /* 'alarm' [R/W] */
         entry = create_proc_entry(ACPI_SYSTEM_FILE_ALARM,