Commit cf4fb80ca3d591cae366ae8364e3c3f7a68bd249
Committed by
Rafael J. Wysocki
Rafael J. Wysocki
1 parent
7538e3db6e
Exists in
master
and in
7 other branches
PM: Simplify kernel/power/Kconfig
'n' defaults are pretty pointless and actually bogus when used with prompt-less config options. The "bool"/"default y" pair with no prompt can be expressed more compactly using def_bool. [rjw: Rebased on top of earlier patches modifying this file.] Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Showing 1 changed file with 3 additions and 9 deletions Side-by-side Diff
kernel/power/Kconfig
| ... | ... | @@ -84,18 +84,16 @@ |
| 84 | 84 | device. |
| 85 | 85 | |
| 86 | 86 | config PM_SLEEP |
| 87 | - bool | |
| 87 | + def_bool y | |
| 88 | 88 | depends on SUSPEND || HIBERNATION || XEN_SAVE_RESTORE |
| 89 | - default y | |
| 90 | 89 | |
| 91 | 90 | config PM_SLEEP_SMP |
| 92 | - bool | |
| 91 | + def_bool y | |
| 93 | 92 | depends on SMP |
| 94 | 93 | depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE |
| 95 | 94 | depends on PM_SLEEP |
| 96 | 95 | select HOTPLUG |
| 97 | 96 | select HOTPLUG_CPU |
| 98 | - default y | |
| 99 | 97 | |
| 100 | 98 | config PM_RUNTIME |
| 101 | 99 | bool "Run-time PM core functionality" |
| 102 | 100 | |
| ... | ... | @@ -112,9 +110,8 @@ |
| 112 | 110 | wake-up events. |
| 113 | 111 | |
| 114 | 112 | config PM |
| 115 | - bool | |
| 113 | + def_bool y | |
| 116 | 114 | depends on PM_SLEEP || PM_RUNTIME |
| 117 | - default y | |
| 118 | 115 | |
| 119 | 116 | config PM_DEBUG |
| 120 | 117 | bool "Power Management Debug Support" |
| 121 | 118 | |
| ... | ... | @@ -127,14 +124,12 @@ |
| 127 | 124 | config PM_VERBOSE |
| 128 | 125 | bool "Verbose Power Management debugging" |
| 129 | 126 | depends on PM_DEBUG |
| 130 | - default n | |
| 131 | 127 | ---help--- |
| 132 | 128 | This option enables verbose messages from the Power Management code. |
| 133 | 129 | |
| 134 | 130 | config PM_ADVANCED_DEBUG |
| 135 | 131 | bool "Extra PM attributes in sysfs for low-level debugging/testing" |
| 136 | 132 | depends on PM_DEBUG |
| 137 | - default n | |
| 138 | 133 | ---help--- |
| 139 | 134 | Add extra sysfs attributes allowing one to access some Power Management |
| 140 | 135 | fields of device objects from user space. If you are not a kernel |
| ... | ... | @@ -175,7 +170,6 @@ |
| 175 | 170 | depends on CAN_PM_TRACE |
| 176 | 171 | depends on X86 |
| 177 | 172 | select PM_TRACE |
| 178 | - default n | |
| 179 | 173 | ---help--- |
| 180 | 174 | This enables some cheesy code to save the last PM event point in the |
| 181 | 175 | RTC across reboots, so that you can debug a machine that just hangs |