From 3a8d2ccdcff80c2a0aa2367cc4855c7f57e13a06 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Fri, 19 Apr 2013 14:35:45 +0300 Subject: [PATCH] staging: rts5129: re-use kbasename() The custom filename function mostly repeats the kernel's kbasename. This patch simplifies it. The updated filename() will not check for the '\' in the filenames. It seems redundant in Linux. The __FILE__ macro always defined if we compile an existing file. Thus, NULL check is not needed there as well. Signed-off-by: Andy Shevchenko Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rts5139/trace.h | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/drivers/staging/rts5139/trace.h b/drivers/staging/rts5139/trace.h index c9dfb1ea4115..ac58b452ecb8 100644 --- a/drivers/staging/rts5139/trace.h +++ b/drivers/staging/rts5139/trace.h @@ -27,32 +27,16 @@ #ifndef __RTS51X_TRACE_H #define __RTS51X_TRACE_H +#include + #include "debug.h" #define _MSG_TRACE #ifdef _MSG_TRACE -static inline char *filename(char *path) -{ - char *ptr; - - if (path == NULL) - return NULL; - - ptr = path; - - while (*ptr != '\0') { - if ((*ptr == '\\') || (*ptr == '/')) - path = ptr + 1; - ptr++; - } - - return path; -} - #define TRACE_RET(chip, ret) \ do { \ - char *_file = filename((char *)__FILE__); \ + const char *_file = kbasename(__FILE__); \ RTS51X_DEBUGP("[%s][%s]:[%d]\n", _file, __func__, __LINE__); \ (chip)->trace_msg[(chip)->msg_idx].line = (u16)(__LINE__); \ strncpy((chip)->trace_msg[(chip)->msg_idx].func, \ @@ -71,7 +55,7 @@ do { \ #define TRACE_GOTO(chip, label) \ do { \ - char *_file = filename((char *)__FILE__); \ + const char *_file = kbasename(__FILE__); \ RTS51X_DEBUGP("[%s][%s]:[%d]\n", _file, __func__, __LINE__); \ (chip)->trace_msg[(chip)->msg_idx].line = (u16)(__LINE__); \ strncpy((chip)->trace_msg[(chip)->msg_idx].func, \ -- 2.30.2