staging: lustre: remove RETURN macro

[deliverable/linux.git] / drivers / staging / lustre / include / linux / libcfs / libcfs_debug.h

diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
index dd8ac2f52c9f83e299ebe09c782b1550af4a3bcb..e6439d19f3e55939d98f2bd240442b2d31258e14 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
@@ -262,74 +262,6 @@ do {                                                                   \
 } while (0)
 
 
-/*
- * if rc == NULL, we need to code as RETURN((void *)NULL), otherwise
- * there will be a warning in osx.
- */
-#if defined(__GNUC__)
-
-long libcfs_log_return(struct libcfs_debug_msg_data *, long rc);
-#if BITS_PER_LONG > 32
-#define RETURN(rc)                                                     \
-do {                                                                   \
-       EXIT_NESTING;                                                   \
-       if (cfs_cdebug_show(D_TRACE, DEBUG_SUBSYSTEM)) {                \
-               LIBCFS_DEBUG_MSG_DATA_DECL(msgdata, D_TRACE, NULL);     \
-               return (typeof(rc))libcfs_log_return(&msgdata,          \
-                                                    (long)(rc));       \
-       }                                                               \
-                                                                       \
-       return (rc);                                                    \
-} while (0)
-#else /* BITS_PER_LONG == 32 */
-/* We need an on-stack variable, because we cannot case a 32-bit pointer
- * directly to (long long) without generating a complier warning/error, yet
- * casting directly to (long) will truncate 64-bit return values. The log
- * values will print as 32-bit values, but they always have been. LU-1436
- */
-#define RETURN(rc)                                                     \
-do {                                                                   \
-       EXIT_NESTING;                                                   \
-       if (cfs_cdebug_show(D_TRACE, DEBUG_SUBSYSTEM)) {                \
-               typeof(rc) __rc = (rc);                                 \
-               LIBCFS_DEBUG_MSG_DATA_DECL(msgdata, D_TRACE, NULL);     \
-               libcfs_log_return(&msgdata, (long_ptr_t)__rc);          \
-               return __rc;                                            \
-       }                                                               \
-                                                                       \
-       return (rc);                                                    \
-} while (0)
-#endif /* BITS_PER_LONG > 32 */
-
-#elif defined(_MSC_VER)
-#define RETURN(rc)                                                   \
-do {                                                               \
-       CDEBUG(D_TRACE, "Process leaving.\n");                    \
-       EXIT_NESTING;                                              \
-       return (rc);                                                \
-} while (0)
-#else
-# error "Unkown compiler"
-#endif /* __GNUC__ */
-
-#define ENTRY                                                     \
-ENTRY_NESTING;                                                   \
-do {                                                               \
-       CDEBUG(D_TRACE, "Process entered\n");                      \
-} while (0)
-
-#define EXIT                                                       \
-do {                                                               \
-       CDEBUG(D_TRACE, "Process leaving\n");                      \
-       EXIT_NESTING;                                              \
-} while(0)
-
-#define RETURN_EXIT                                                    \
-do {                                                                   \
-       EXIT;                                                           \
-       return;                                                         \
-} while (0)
-
 extern int libcfs_debug_msg(struct libcfs_debug_msg_data *msgdata,
                            const char *format1, ...)
        __attribute__ ((format (printf, 2, 3)));