staging: lustre: remove RETURN macro

[deliverable/linux.git] / drivers / staging / lustre / lustre / osc / osc_dev.c

diff --git a/drivers/staging/lustre/lustre/osc/osc_dev.c b/drivers/staging/lustre/lustre/osc/osc_dev.c
index 4059591f25b064cdc6dfe2575fa48737b57a6ff4..35f25786763719a0b1ac407a5b3dae0015612fb6 100644 (file)
--- a/drivers/staging/lustre/lustre/osc/osc_dev.c
+++ b/drivers/staging/lustre/lustre/osc/osc_dev.c
@@ -171,7 +171,7 @@ LU_TYPE_INIT_FINI(osc, &osc_key, &osc_session_key);
 static int osc_cl_process_config(const struct lu_env *env,
                                 struct lu_device *d, struct lustre_cfg *cfg)
 {
-       RETURN(osc_process_config_base(d->ld_obd, cfg));
+       return osc_process_config_base(d->ld_obd, cfg);
 }
 
 static const struct lu_device_operations osc_lu_ops = {
@@ -187,7 +187,7 @@ static const struct cl_device_operations osc_cl_ops = {
 static int osc_device_init(const struct lu_env *env, struct lu_device *d,
                           const char *name, struct lu_device *next)
 {
-       RETURN(0);
+       return 0;
 }
 
 static struct lu_device *osc_device_fini(const struct lu_env *env,
@@ -217,7 +217,7 @@ static struct lu_device *osc_device_alloc(const struct lu_env *env,
 
        OBD_ALLOC_PTR(od);
        if (od == NULL)
-               RETURN(ERR_PTR(-ENOMEM));
+               return ERR_PTR(-ENOMEM);
 
        cl_device_init(&od->od_cl, t);
        d = osc2lu_dev(od);
@@ -230,10 +230,10 @@ static struct lu_device *osc_device_alloc(const struct lu_env *env,
        rc = osc_setup(obd, cfg);
        if (rc) {
                osc_device_free(env, d);
-               RETURN(ERR_PTR(rc));
+               return ERR_PTR(rc);
        }
        od->od_exp = obd->obd_self_export;
-       RETURN(d);
+       return d;
 }
 
 static const struct lu_device_type_operations osc_device_type_ops = {