aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.cz>2014-04-03 14:48:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-03 16:21:07 -0700
commit0185698c0f543d4e8677bb97227ebe46024e3eb8 (patch)
tree2630cfc5a041947d382d58cb3112d4f594c3d257 /include/linux
parentvsprintf: remove %n handling (diff)
downloadlinux-dev-0185698c0f543d4e8677bb97227ebe46024e3eb8.tar.xz
linux-dev-0185698c0f543d4e8677bb97227ebe46024e3eb8.zip
printk: remove duplicated check for log level
The check for the exact log level is already done in printk_get_level. We do not need to duplicate it in printk_skip_level. Signed-off-by: Petr Mladek <pmladek@suse.cz> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Jan Kara <jack@suse.cz> Cc: Michal Hocko <mhocko@suse.cz> Cc: Kay Sievers <kay@vrfy.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/printk.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/include/linux/printk.h b/include/linux/printk.h
index fa47e2708c01..8860575899f2 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -24,13 +24,9 @@ static inline int printk_get_level(const char *buffer)
static inline const char *printk_skip_level(const char *buffer)
{
- if (printk_get_level(buffer)) {
- switch (buffer[1]) {
- case '0' ... '7':
- case 'd': /* KERN_DEFAULT */
- return buffer + 2;
- }
- }
+ if (printk_get_level(buffer))
+ return buffer + 2;
+
return buffer;
}