Commit 2e5ba26a483218b51b7b327fb235b348890aea15
Committed by
Greg Kroah-Hartman
Greg Kroah-Hartman
1 parent
0732b49c8c
Exists in
master
and in
39 other branches
dynamic_printk: reduce one level of indentation
Cleanup pr_debug_write() to reduce one level of indentation. Cc: Marcel Holtmann <marcel@holtmann.org> Acked-by: Jason Baron <jbaron@redhat.com> Signed-off-by: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Showing 1 changed file with 26 additions and 32 deletions Side-by-side Diff
lib/dynamic_printk.c
| ... | ... | @@ -277,40 +277,34 @@ |
| 277 | 277 | dynamic_enabled = DYNAMIC_ENABLED_NONE; |
| 278 | 278 | } |
| 279 | 279 | err = 0; |
| 280 | - } else { | |
| 281 | - if (elem) { | |
| 282 | - if (value && (elem->enable == 0)) { | |
| 283 | - dynamic_printk_enabled |= | |
| 284 | - (1LL << elem->hash1); | |
| 285 | - dynamic_printk_enabled2 |= | |
| 286 | - (1LL << elem->hash2); | |
| 287 | - elem->enable = 1; | |
| 288 | - num_enabled++; | |
| 289 | - dynamic_enabled = DYNAMIC_ENABLED_SOME; | |
| 290 | - err = 0; | |
| 291 | - printk(KERN_DEBUG | |
| 292 | - "debugging enabled for module %s\n", | |
| 293 | - elem->name); | |
| 294 | - } else if (!value && (elem->enable == 1)) { | |
| 295 | - elem->enable = 0; | |
| 296 | - num_enabled--; | |
| 297 | - if (disabled_hash(elem->hash1, true)) | |
| 298 | - dynamic_printk_enabled &= | |
| 280 | + } else if (elem) { | |
| 281 | + if (value && (elem->enable == 0)) { | |
| 282 | + dynamic_printk_enabled |= (1LL << elem->hash1); | |
| 283 | + dynamic_printk_enabled2 |= (1LL << elem->hash2); | |
| 284 | + elem->enable = 1; | |
| 285 | + num_enabled++; | |
| 286 | + dynamic_enabled = DYNAMIC_ENABLED_SOME; | |
| 287 | + err = 0; | |
| 288 | + printk(KERN_DEBUG | |
| 289 | + "debugging enabled for module %s\n", | |
| 290 | + elem->name); | |
| 291 | + } else if (!value && (elem->enable == 1)) { | |
| 292 | + elem->enable = 0; | |
| 293 | + num_enabled--; | |
| 294 | + if (disabled_hash(elem->hash1, true)) | |
| 295 | + dynamic_printk_enabled &= | |
| 299 | 296 | ~(1LL << elem->hash1); |
| 300 | - if (disabled_hash(elem->hash2, false)) | |
| 301 | - dynamic_printk_enabled2 &= | |
| 297 | + if (disabled_hash(elem->hash2, false)) | |
| 298 | + dynamic_printk_enabled2 &= | |
| 302 | 299 | ~(1LL << elem->hash2); |
| 303 | - if (num_enabled) | |
| 304 | - dynamic_enabled = | |
| 305 | - DYNAMIC_ENABLED_SOME; | |
| 306 | - else | |
| 307 | - dynamic_enabled = | |
| 308 | - DYNAMIC_ENABLED_NONE; | |
| 309 | - err = 0; | |
| 310 | - printk(KERN_DEBUG | |
| 311 | - "debugging disabled for module " | |
| 312 | - "%s\n", elem->name); | |
| 313 | - } | |
| 300 | + if (num_enabled) | |
| 301 | + dynamic_enabled = DYNAMIC_ENABLED_SOME; | |
| 302 | + else | |
| 303 | + dynamic_enabled = DYNAMIC_ENABLED_NONE; | |
| 304 | + err = 0; | |
| 305 | + printk(KERN_DEBUG | |
| 306 | + "debugging disabled for module %s\n", | |
| 307 | + elem->name); | |
| 314 | 308 | } |
| 315 | 309 | } |
| 316 | 310 | } |