From e8291974f9d51906acbcda639f5e0e33f6eae765 Mon Sep 17 00:00:00 2001 From: Greg Donald Date: Sun, 31 Aug 2014 17:40:17 -0500 Subject: [PATCH] drivers: staging: lustre: Fix return is not a function, parentheses are not required errors Fix checkpatch.pl return is not a function, parentheses are not required errors Signed-off-by: Greg Donald Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/lustre/include/lustre_log.h | 2 +- drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 2 +- drivers/staging/lustre/lustre/lov/lov_internal.h | 2 +- drivers/staging/lustre/lustre/lov/lov_pool.c | 2 +- drivers/staging/lustre/lustre/osc/osc_request.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/lustre/lustre/include/lustre_log.h b/drivers/staging/lustre/lustre/include/lustre_log.h index ed9788742fa1..2f50b81e326f 100644 --- a/drivers/staging/lustre/lustre/include/lustre_log.h +++ b/drivers/staging/lustre/lustre/include/lustre_log.h @@ -447,7 +447,7 @@ static inline int llog_group_ctxt_null(struct obd_llog_group *olg, int index) static inline int llog_ctxt_null(struct obd_device *obd, int index) { - return (llog_group_ctxt_null(&obd->obd_olg, index)); + return llog_group_ctxt_null(&obd->obd_olg, index); } static inline int llog_destroy(const struct lu_env *env, diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c index 150b44de0f64..a0d39256b926 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c @@ -631,7 +631,7 @@ EXPORT_SYMBOL(ldlm_pool_shrink); int ldlm_pool_setup(struct ldlm_pool *pl, int limit) { if (pl->pl_ops->po_setup != NULL) - return(pl->pl_ops->po_setup(pl, limit)); + return pl->pl_ops->po_setup(pl, limit); return 0; } EXPORT_SYMBOL(ldlm_pool_setup); diff --git a/drivers/staging/lustre/lustre/lov/lov_internal.h b/drivers/staging/lustre/lustre/lov/lov_internal.h index 1b96fac4889d..c61db3a1dd2a 100644 --- a/drivers/staging/lustre/lustre/lov/lov_internal.h +++ b/drivers/staging/lustre/lustre/lov/lov_internal.h @@ -140,7 +140,7 @@ static inline struct lov_lock_handles * lov_handle2llh(struct lustre_handle *handle) { LASSERT(handle != NULL); - return(class_handle2object(handle->cookie)); + return class_handle2object(handle->cookie); } static inline void lov_llh_put(struct lov_lock_handles *llh) diff --git a/drivers/staging/lustre/lustre/lov/lov_pool.c b/drivers/staging/lustre/lustre/lov/lov_pool.c index 91b3509a8083..ec48ea44bd38 100644 --- a/drivers/staging/lustre/lustre/lov/lov_pool.c +++ b/drivers/staging/lustre/lustre/lov/lov_pool.c @@ -107,7 +107,7 @@ static void *pool_key(struct hlist_node *hnode) struct pool_desc *pool; pool = hlist_entry(hnode, struct pool_desc, pool_hash); - return (pool->pool_name); + return pool->pool_name; } static int pool_hashkey_keycmp(const void *key, struct hlist_node *compared_hnode) diff --git a/drivers/staging/lustre/lustre/osc/osc_request.c b/drivers/staging/lustre/lustre/osc/osc_request.c index e3feb216f3cb..d9f72496698c 100644 --- a/drivers/staging/lustre/lustre/osc/osc_request.c +++ b/drivers/staging/lustre/lustre/osc/osc_request.c @@ -1120,7 +1120,7 @@ static int check_write_rcs(struct ptlrpc_request *req, /* return error if any niobuf was in error */ for (i = 0; i < niocount; i++) { if ((int)remote_rcs[i] < 0) - return(remote_rcs[i]); + return remote_rcs[i]; if (remote_rcs[i] != 0) { CDEBUG(D_INFO, "rc[%d] invalid (%d) req %p\n", -- 2.30.2