From f98d039c312d28b2161bf534d8232d74aaf2b945 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Thu, 25 Oct 2012 12:15:05 +1100 Subject: [PATCH] staging: rts_pstor: 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 Cc: YAMANE Toshiaki Acked-by: Greg Kroah-Hartman Signed-off-by: Andrew Morton --- drivers/staging/rts_pstor/trace.h | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/drivers/staging/rts_pstor/trace.h b/drivers/staging/rts_pstor/trace.h index cf60a1b872b3..bff99bfdfb2b 100644 --- a/drivers/staging/rts_pstor/trace.h +++ b/drivers/staging/rts_pstor/trace.h @@ -24,31 +24,15 @@ #ifndef __REALTEK_RTSX_TRACE_H #define __REALTEK_RTSX_TRACE_H +#include + #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(__FILE__); \ + const char *_file = kbasename(__FILE__); \ RTSX_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, __func__, MSG_FUNC_LEN-1); \ @@ -64,7 +48,7 @@ do { \ #define TRACE_GOTO(chip, label) \ do { \ - char *_file = filename(__FILE__); \ + const char *_file = kbasename(__FILE__); \ RTSX_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, __func__, MSG_FUNC_LEN-1); \ -- 2.39.5