Skip to content

Commit

Permalink
staging: rts5129: re-use kbasename()
Browse files Browse the repository at this point in the history
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 <andriy.shevchenko@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Andy Shevchenko authored and Greg Kroah-Hartman committed Apr 19, 2013
1 parent f33cb17 commit 3a8d2cc
Showing 1 changed file with 4 additions and 20 deletions.
24 changes: 4 additions & 20 deletions drivers/staging/rts5139/trace.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,32 +27,16 @@
#ifndef __RTS51X_TRACE_H
#define __RTS51X_TRACE_H

#include <linux/string.h>

#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, \
Expand All @@ -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, \
Expand Down

0 comments on commit 3a8d2cc

Please sign in to comment.