staging: lustre: remove RETURN macro

[deliverable/linux.git] / drivers / staging / lustre / lustre / obdclass / capa.c

diff --git a/drivers/staging/lustre/lustre/obdclass/capa.c b/drivers/staging/lustre/lustre/obdclass/capa.c
index 3e532f5106e456cba6177603fd7c411ed9efaba8..fe3fa8ec9f24c8530e3c75f5f258720e416c6637 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/capa.c
+++ b/drivers/staging/lustre/lustre/obdclass/capa.c
@@ -42,7 +42,6 @@
 
 #define DEBUG_SUBSYSTEM S_SEC
 
-#include <linux/version.h>
 #include <linux/fs.h>
 #include <asm/unistd.h>
 #include <linux/slab.h>
@@ -277,14 +276,13 @@ int capa_encrypt_id(__u32 *d, __u32 *s, __u8 *key, int keylen)
        unsigned int min;
        int rc;
        char alg[CRYPTO_MAX_ALG_NAME+1] = "aes";
-       ENTRY;
 
        /* passing "aes" in a variable instead of a constant string keeps gcc
         * 4.3.2 happy */
        tfm = ll_crypto_alloc_blkcipher(alg, 0, 0 );
        if (IS_ERR(tfm)) {
                CERROR("failed to load transform for aes\n");
-               RETURN(PTR_ERR(tfm));
+               return PTR_ERR(tfm);
        }
 
        min = ll_crypto_tfm_alg_min_keysize(tfm);
@@ -313,8 +311,6 @@ int capa_encrypt_id(__u32 *d, __u32 *s, __u8 *key, int keylen)
                GOTO(out, rc);
        }
 
-       EXIT;
-
 out:
        ll_crypto_free_blkcipher(tfm);
        return rc;
@@ -330,14 +326,13 @@ int capa_decrypt_id(__u32 *d, __u32 *s, __u8 *key, int keylen)
        unsigned int min;
        int rc;
        char alg[CRYPTO_MAX_ALG_NAME+1] = "aes";
-       ENTRY;
 
        /* passing "aes" in a variable instead of a constant string keeps gcc
         * 4.3.2 happy */
        tfm = ll_crypto_alloc_blkcipher(alg, 0, 0 );
        if (IS_ERR(tfm)) {
                CERROR("failed to load transform for aes\n");
-               RETURN(PTR_ERR(tfm));
+               return PTR_ERR(tfm);
        }
 
        min = ll_crypto_tfm_alg_min_keysize(tfm);
@@ -367,8 +362,6 @@ int capa_decrypt_id(__u32 *d, __u32 *s, __u8 *key, int keylen)
                GOTO(out, rc);
        }
 
-       EXIT;
-
 out:
        ll_crypto_free_blkcipher(tfm);
        return rc;