From: Pavel Machek Macros in proc.c make code both longer *and* less readable; I think they should die. Signed-off-by: Pavel Machek Cc: "Brown, Len" Signed-off-by: Andrew Morton --- drivers/acpi/sleep/proc.c | 19 ++++++------------- 1 files changed, 6 insertions(+), 13 deletions(-) diff -puN drivers/acpi/sleep/proc.c~fix-up-macro-abuse-in-drivers-acpi-sleep-procc drivers/acpi/sleep/proc.c --- 25/drivers/acpi/sleep/proc.c~fix-up-macro-abuse-in-drivers-acpi-sleep-procc 2005-06-05 22:52:04.000000000 -0700 +++ 25-akpm/drivers/acpi/sleep/proc.c 2005-06-05 22:52:04.000000000 -0700 @@ -13,10 +13,6 @@ #include "sleep.h" -#define ACPI_SYSTEM_FILE_SLEEP "sleep" -#define ACPI_SYSTEM_FILE_ALARM "alarm" -#define ACPI_SYSTEM_FILE_WAKEUP_DEVICE "wakeup" - #define _COMPONENT ACPI_SYSTEM_COMPONENT ACPI_MODULE_NAME ("sleep") @@ -479,26 +475,23 @@ static u32 rtc_handler(void * context) static int acpi_sleep_proc_init(void) { - struct proc_dir_entry *entry = NULL; + struct proc_dir_entry *entry = NULL; if (acpi_disabled) return 0; - /* 'sleep' [R/W]*/ - entry = create_proc_entry(ACPI_SYSTEM_FILE_SLEEP, - S_IFREG|S_IRUGO|S_IWUSR, acpi_root_dir); + /* 'sleep' [R/W] */ + entry = create_proc_entry("sleep", S_IFREG|S_IRUGO|S_IWUSR, acpi_root_dir); if (entry) entry->proc_fops = &acpi_system_sleep_fops; /* 'alarm' [R/W] */ - entry = create_proc_entry(ACPI_SYSTEM_FILE_ALARM, - S_IFREG|S_IRUGO|S_IWUSR, acpi_root_dir); + entry = create_proc_entry("alarm", S_IFREG|S_IRUGO|S_IWUSR, acpi_root_dir); if (entry) entry->proc_fops = &acpi_system_alarm_fops; - /* 'wakeup device' [R/W]*/ - entry = create_proc_entry(ACPI_SYSTEM_FILE_WAKEUP_DEVICE, - S_IFREG|S_IRUGO|S_IWUSR, acpi_root_dir); + /* 'wakeup device' [R/W] */ + entry = create_proc_entry("wakeup", S_IFREG|S_IRUGO|S_IWUSR, acpi_root_dir); if (entry) entry->proc_fops = &acpi_system_wakeup_device_fops; _