staging: lustre: remove RETURN macro

[deliverable/linux.git] / drivers / staging / lustre / lustre / libcfs / hash.c

diff --git a/drivers/staging/lustre/lustre/libcfs/hash.c b/drivers/staging/lustre/lustre/libcfs/hash.c
index 87f52563eab0bd7a7131fe6ff183f9d13e2b7f15..0dd12c8c91b6126c0c790ef8932e033dcdc0d468 100644 (file)
--- a/drivers/staging/lustre/lustre/libcfs/hash.c
+++ b/drivers/staging/lustre/lustre/libcfs/hash.c
@@ -1053,7 +1053,7 @@ cfs_hash_create(char *name, unsigned cur_bits, unsigned max_bits,
              CFS_HASH_NAME_LEN : CFS_HASH_BIGNAME_LEN;
        LIBCFS_ALLOC(hs, offsetof(cfs_hash_t, hs_name[len]));
        if (hs == NULL)
-               RETURN(NULL);
+               return NULL;
 
        strncpy(hs->hs_name, name, len);
        hs->hs_name[len - 1] = '\0';
@@ -1085,7 +1085,7 @@ cfs_hash_create(char *name, unsigned cur_bits, unsigned max_bits,
                return hs;
 
        LIBCFS_FREE(hs, offsetof(cfs_hash_t, hs_name[len]));
-       RETURN(NULL);
+       return NULL;
 }
 EXPORT_SYMBOL(cfs_hash_create);
 
@@ -1483,7 +1483,7 @@ cfs_hash_for_each_tight(cfs_hash_t *hs, cfs_hash_for_each_cb_t func,
        cfs_hash_unlock(hs, 0);
 
        cfs_hash_for_each_exit(hs);
-       RETURN(count);
+       return count;
 }
 
 typedef struct {
@@ -1645,18 +1645,18 @@ cfs_hash_for_each_nolock(cfs_hash_t *hs,
        if (cfs_hash_with_no_lock(hs) ||
            cfs_hash_with_rehash_key(hs) ||
            !cfs_hash_with_no_itemref(hs))
-               RETURN(-EOPNOTSUPP);
+               return -EOPNOTSUPP;
 
        if (CFS_HOP(hs, get) == NULL ||
            (CFS_HOP(hs, put) == NULL &&
             CFS_HOP(hs, put_locked) == NULL))
-               RETURN(-EOPNOTSUPP);
+               return -EOPNOTSUPP;
 
        cfs_hash_for_each_enter(hs);
        cfs_hash_for_each_relax(hs, func, data);
        cfs_hash_for_each_exit(hs);
 
-       RETURN(0);
+       return 0;
 }
 EXPORT_SYMBOL(cfs_hash_for_each_nolock);
 
@@ -1691,7 +1691,7 @@ cfs_hash_for_each_empty(cfs_hash_t *hs,
                       hs->hs_name, i++);
        }
        cfs_hash_for_each_exit(hs);
-       RETURN(0);
+       return 0;
 }
 EXPORT_SYMBOL(cfs_hash_for_each_empty);