staging: lustre: remove RETURN macro

[deliverable/linux.git] / drivers / staging / lustre / lustre / fid / lproc_fid.c

diff --git a/drivers/staging/lustre/lustre/fid/lproc_fid.c b/drivers/staging/lustre/lustre/fid/lproc_fid.c
index af817a867f8b17068adb3a2caa4191cdf10aecbd..294070da9d43217eeff7a1b2b211284054b2257f 100644 (file)
--- a/drivers/staging/lustre/lustre/fid/lproc_fid.c
+++ b/drivers/staging/lustre/lustre/fid/lproc_fid.c
@@ -65,7 +65,6 @@ lprocfs_fid_write_common(const char *buffer, unsigned long count,
 {
        struct lu_seq_range tmp;
        int rc;
-       ENTRY;
 
        LASSERT(range != NULL);
 
@@ -73,9 +72,9 @@ lprocfs_fid_write_common(const char *buffer, unsigned long count,
                    (long long unsigned *)&tmp.lsr_start,
                    (long long unsigned *)&tmp.lsr_end);
        if (rc != 2 || !range_is_sane(&tmp) || range_is_zero(&tmp))
-               RETURN(-EINVAL);
+               return -EINVAL;
        *range = tmp;
-       RETURN(0);
+       return 0;
 }
 
 /* Client side procfs stuff */
@@ -85,7 +84,6 @@ lprocfs_fid_space_seq_write(struct file *file, const char *buffer,
 {
        struct lu_client_seq *seq = ((struct seq_file *)file->private_data)->private;
        int rc;
-       ENTRY;
 
        LASSERT(seq != NULL);
 
@@ -99,7 +97,7 @@ lprocfs_fid_space_seq_write(struct file *file, const char *buffer,
 
        mutex_unlock(&seq->lcs_mutex);
 
-       RETURN(count);
+       return count;
 }
 
 static int
@@ -107,7 +105,6 @@ lprocfs_fid_space_seq_show(struct seq_file *m, void *unused)
 {
        struct lu_client_seq *seq = (struct lu_client_seq *)m->private;
        int rc;
-       ENTRY;
 
        LASSERT(seq != NULL);
 
@@ -115,7 +112,7 @@ lprocfs_fid_space_seq_show(struct seq_file *m, void *unused)
        rc = seq_printf(m, "["LPX64" - "LPX64"]:%x:%s\n", PRANGE(&seq->lcs_space));
        mutex_unlock(&seq->lcs_mutex);
 
-       RETURN(rc);
+       return rc;
 }
 
 static ssize_t
@@ -125,13 +122,12 @@ lprocfs_fid_width_seq_write(struct file *file, const char *buffer,
        struct lu_client_seq *seq = ((struct seq_file *)file->private_data)->private;
        __u64  max;
        int rc, val;
-       ENTRY;
 
        LASSERT(seq != NULL);
 
        rc = lprocfs_write_helper(buffer, count, &val);
        if (rc)
-               RETURN(rc);
+               return rc;
 
        mutex_lock(&seq->lcs_mutex);
        if (seq->lcs_type == LUSTRE_SEQ_DATA)
@@ -150,7 +146,7 @@ lprocfs_fid_width_seq_write(struct file *file, const char *buffer,
 
        mutex_unlock(&seq->lcs_mutex);
 
-       RETURN(count);
+       return count;
 }
 
 static int
@@ -158,7 +154,6 @@ lprocfs_fid_width_seq_show(struct seq_file *m, void *unused)
 {
        struct lu_client_seq *seq = (struct lu_client_seq *)m->private;
        int rc;
-       ENTRY;
 
        LASSERT(seq != NULL);
 
@@ -166,7 +161,7 @@ lprocfs_fid_width_seq_show(struct seq_file *m, void *unused)
        rc = seq_printf(m, LPU64"\n", seq->lcs_width);
        mutex_unlock(&seq->lcs_mutex);
 
-       RETURN(rc);
+       return rc;
 }
 
 static int
@@ -174,7 +169,6 @@ lprocfs_fid_fid_seq_show(struct seq_file *m, void *unused)
 {
        struct lu_client_seq *seq = (struct lu_client_seq *)m->private;
        int rc;
-       ENTRY;
 
        LASSERT(seq != NULL);
 
@@ -182,7 +176,7 @@ lprocfs_fid_fid_seq_show(struct seq_file *m, void *unused)
        rc = seq_printf(m, DFID"\n", PFID(&seq->lcs_fid));
        mutex_unlock(&seq->lcs_mutex);
 
-       RETURN(rc);
+       return rc;
 }
 
 static int
@@ -191,7 +185,6 @@ lprocfs_fid_server_seq_show(struct seq_file *m, void *unused)
        struct lu_client_seq *seq = (struct lu_client_seq *)m->private;
        struct client_obd *cli;
        int rc;
-       ENTRY;
 
        LASSERT(seq != NULL);
 
@@ -201,12 +194,9 @@ lprocfs_fid_server_seq_show(struct seq_file *m, void *unused)
        } else {
                rc = seq_printf(m, "%s\n", seq->lcs_srv->lss_name);
        }
-       RETURN(rc);
+       return rc;
 }
 
-struct lprocfs_vars seq_server_proc_list[] = {
-};
-
 LPROC_SEQ_FOPS(lprocfs_fid_space);
 LPROC_SEQ_FOPS(lprocfs_fid_width);
 LPROC_SEQ_FOPS_RO(lprocfs_fid_server);