staging: lustre: Remove braces for single statement in kernel_user_comm.c

[~andy/linux] / drivers / staging / lustre / lustre / mgc / libmgc.c

diff --git a/drivers/staging/lustre/lustre/mgc/libmgc.c b/drivers/staging/lustre/lustre/mgc/libmgc.c
index 442146cc7e608d3790f8a69e4f854e829180118a..9b40c57d3cd4934b911d4ede4145e9a03c9cef38 100644 (file)
--- a/drivers/staging/lustre/lustre/mgc/libmgc.c
+++ b/drivers/staging/lustre/lustre/mgc/libmgc.c
@@ -56,7 +56,6 @@
 static int mgc_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
 {
        int rc;
-       ENTRY;
 
        ptlrpcd_addref();
 
@@ -73,19 +72,18 @@ static int mgc_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
                GOTO(err_cleanup, rc);
        }
 
-       RETURN(rc);
+       return rc;
 
 err_cleanup:
        client_obd_cleanup(obd);
 err_decref:
        ptlrpcd_decref();
-       RETURN(rc);
+       return rc;
 }
 
 static int mgc_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage)
 {
        int rc = 0;
-       ENTRY;
 
        switch (stage) {
        case OBD_CLEANUP_EARLY:
@@ -96,21 +94,17 @@ static int mgc_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage)
                        CERROR("failed to cleanup llogging subsystems\n");
                break;
        }
-       RETURN(rc);
+       return rc;
 }
 
 static int mgc_cleanup(struct obd_device *obd)
 {
-       struct client_obd *cli = &obd->u.cli;
        int rc;
-       ENTRY;
-
-       LASSERT(cli->cl_mgc_vfsmnt == NULL);
 
        ptlrpcd_decref();
 
        rc = client_obd_cleanup(obd);
-       RETURN(rc);
+       return rc;
 }
 
 static int mgc_llog_init(struct obd_device *obd, struct obd_llog_group *olg,
@@ -118,32 +112,30 @@ static int mgc_llog_init(struct obd_device *obd, struct obd_llog_group *olg,
 {
        struct llog_ctxt *ctxt;
        int rc;
-       ENTRY;
 
        LASSERT(olg == &obd->obd_olg);
        rc = llog_setup(NULL, obd, olg, LLOG_CONFIG_REPL_CTXT, tgt,
                        &llog_client_ops);
        if (rc < 0)
-               RETURN(rc);
+               return rc;
 
        ctxt = llog_group_get_ctxt(olg, LLOG_CONFIG_REPL_CTXT);
        llog_initiator_connect(ctxt);
        llog_ctxt_put(ctxt);
 
-       RETURN(rc);
+       return rc;
 }
 
 static int mgc_llog_finish(struct obd_device *obd, int count)
 {
        struct llog_ctxt *ctxt;
 
-       ENTRY;
 
        ctxt = llog_get_context(obd, LLOG_CONFIG_REPL_CTXT);
        if (ctxt)
                llog_cleanup(NULL, ctxt);
 
-       RETURN(0);
+       return 0;
 }
 
 struct obd_ops mgc_obd_ops = {