staging: lustre: remove RETURN macro

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

diff --git a/drivers/staging/lustre/lustre/obdclass/llog_obd.c b/drivers/staging/lustre/lustre/obdclass/llog_obd.c
index 7d6c94b463a375ff7c79dbf7879f2fbcedf81f30..71817af75396faf1dd26eaf7067710545b4ad7fd 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/llog_obd.c
+++ b/drivers/staging/lustre/lustre/obdclass/llog_obd.c
@@ -138,7 +138,7 @@ int llog_cleanup(const struct lu_env *env, struct llog_ctxt *ctxt)
        l_wait_event(olg->olg_waitq,
                     llog_group_ctxt_null(olg, idx), &lwi);
 
-       RETURN(rc);
+       return rc;
 }
 EXPORT_SYMBOL(llog_cleanup);
 
@@ -150,13 +150,13 @@ int llog_setup(const struct lu_env *env, struct obd_device *obd,
        int rc = 0;
 
        if (index < 0 || index >= LLOG_MAX_CTXTS)
-               RETURN(-EINVAL);
+               return -EINVAL;
 
        LASSERT(olg != NULL);
 
        ctxt = llog_new_ctxt(obd);
        if (!ctxt)
-               RETURN(-ENOMEM);
+               return -ENOMEM;
 
        ctxt->loc_obd = obd;
        ctxt->loc_olg = olg;
@@ -187,7 +187,7 @@ int llog_setup(const struct lu_env *env, struct obd_device *obd,
                        }
                        rc = 0;
                }
-               RETURN(rc);
+               return rc;
        }
 
        if (op->lop_setup) {
@@ -208,7 +208,7 @@ int llog_setup(const struct lu_env *env, struct obd_device *obd,
                ctxt->loc_flags &= ~LLOG_CTXT_FLAG_UNINITIALIZED;
        }
 
-       RETURN(rc);
+       return rc;
 }
 EXPORT_SYMBOL(llog_setup);
 
@@ -217,12 +217,12 @@ int llog_sync(struct llog_ctxt *ctxt, struct obd_export *exp, int flags)
        int rc = 0;
 
        if (!ctxt)
-               RETURN(0);
+               return 0;
 
        if (CTXTP(ctxt, sync))
                rc = CTXTP(ctxt, sync)(ctxt, exp, flags);
 
-       RETURN(rc);
+       return rc;
 }
 EXPORT_SYMBOL(llog_sync);
 
@@ -234,11 +234,11 @@ int llog_obd_add(const struct lu_env *env, struct llog_ctxt *ctxt,
 
        if (!ctxt) {
                CERROR("No ctxt\n");
-               RETURN(-ENODEV);
+               return -ENODEV;
        }
 
        if (ctxt->loc_flags & LLOG_CTXT_FLAG_UNINITIALIZED)
-               RETURN(-ENXIO);
+               return -ENXIO;
 
        CTXT_CHECK_OP(ctxt, obd_add, -EOPNOTSUPP);
        raised = cfs_cap_raised(CFS_CAP_SYS_RESOURCE);
@@ -248,7 +248,7 @@ int llog_obd_add(const struct lu_env *env, struct llog_ctxt *ctxt,
                                  numcookies);
        if (!raised)
                cfs_cap_lower(CFS_CAP_SYS_RESOURCE);
-       RETURN(rc);
+       return rc;
 }
 EXPORT_SYMBOL(llog_obd_add);
 
@@ -260,12 +260,12 @@ int llog_cancel(const struct lu_env *env, struct llog_ctxt *ctxt,
 
        if (!ctxt) {
                CERROR("No ctxt\n");
-               RETURN(-ENODEV);
+               return -ENODEV;
        }
 
        CTXT_CHECK_OP(ctxt, cancel, -EOPNOTSUPP);
        rc = CTXTP(ctxt, cancel)(env, ctxt, lsm, count, cookies, flags);
-       RETURN(rc);
+       return rc;
 }
 EXPORT_SYMBOL(llog_cancel);
 
@@ -278,7 +278,7 @@ int obd_llog_init(struct obd_device *obd, struct obd_llog_group *olg,
        OBD_COUNTER_INCREMENT(obd, llog_init);
 
        rc = OBP(obd, llog_init)(obd, olg, disk_obd, index);
-       RETURN(rc);
+       return rc;
 }
 EXPORT_SYMBOL(obd_llog_init);
 
@@ -290,7 +290,7 @@ int obd_llog_finish(struct obd_device *obd, int count)
        OBD_COUNTER_INCREMENT(obd, llog_finish);
 
        rc = OBP(obd, llog_finish)(obd, count);
-       RETURN(rc);
+       return rc;
 }
 EXPORT_SYMBOL(obd_llog_finish);