tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ACPI: (more) delete CONFIG_ACPI_PROCFS_SLEEP (again)

Commit 2bcf9dddeb8e79a4ba55bf191533f70f39ce
('ACPI: delete CONFIG_ACPI_PROCFS_SLEEP (again)')
was incomplete.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Len Brown <len.brown@intel.com>

authored by Christian Borntraeger and committed by Len Brown 134c2171 b07d68b5

+5 -5
unified split
+5 -5
drivers/acpi/sleep/proc.c
··· 23 */ 24 25 ACPI_MODULE_NAME("sleep") 26 - #ifdef CONFIG_ACPI_PROCFS_SLEEP 27 static int acpi_system_sleep_seq_show(struct seq_file *seq, void *offset) 28 { 29 int i; ··· 76 Done: 77 return error ? error : count; 78 } 79 - #endif /* CONFIG_ACPI_PROCFS_SLEEP */ 80 81 #if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) || !defined(CONFIG_X86) 82 /* use /sys/class/rtc/rtcX/wakealarm instead; it's not ACPI-specific */ ··· 471 .release = single_release, 472 }; 473 474 - #ifdef CONFIG_ACPI_PROCFS_SLEEP 475 static const struct file_operations acpi_system_sleep_fops = { 476 .open = acpi_system_sleep_open_fs, 477 .read = seq_read, ··· 479 .llseek = seq_lseek, 480 .release = single_release, 481 }; 482 - #endif /* CONFIG_ACPI_PROCFS_SLEEP */ 483 484 #ifdef HAVE_ACPI_LEGACY_ALARM 485 static const struct file_operations acpi_system_alarm_fops = { ··· 506 if (acpi_disabled) 507 return 0; 508 509 - #ifdef CONFIG_ACPI_PROCFS_SLEEP 510 /* 'sleep' [R/W] */ 511 entry = 512 create_proc_entry("sleep", S_IFREG | S_IRUGO | S_IWUSR,
··· 23 */ 24 25 ACPI_MODULE_NAME("sleep") 26 + #ifdef CONFIG_ACPI_PROCFS 27 static int acpi_system_sleep_seq_show(struct seq_file *seq, void *offset) 28 { 29 int i; ··· 76 Done: 77 return error ? error : count; 78 } 79 + #endif /* CONFIG_ACPI_PROCFS */ 80 81 #if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) || !defined(CONFIG_X86) 82 /* use /sys/class/rtc/rtcX/wakealarm instead; it's not ACPI-specific */ ··· 471 .release = single_release, 472 }; 473 474 + #ifdef CONFIG_ACPI_PROCFS 475 static const struct file_operations acpi_system_sleep_fops = { 476 .open = acpi_system_sleep_open_fs, 477 .read = seq_read, ··· 479 .llseek = seq_lseek, 480 .release = single_release, 481 }; 482 + #endif /* CONFIG_ACPI_PROCFS */ 483 484 #ifdef HAVE_ACPI_LEGACY_ALARM 485 static const struct file_operations acpi_system_alarm_fops = { ··· 506 if (acpi_disabled) 507 return 0; 508 509 + #ifdef CONFIG_ACPI_PROCFS 510 /* 'sleep' [R/W] */ 511 entry = 512 create_proc_entry("sleep", S_IFREG | S_IRUGO | S_IWUSR,