From: Andreas Ruprecht Date: Sun, 23 Nov 2014 13:37:54 +0000 (+0100) Subject: staging: lustre: ldlm: Remove unnecessary line continuations X-Git-Tag: v3.19-rc1~66^2~209 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b0e47b96e313aa6c855843b506626b3fbeb3bcc7;p=karo-tx-linux.git staging: lustre: ldlm: Remove unnecessary line continuations checkpatch finds two unnecessary line continuations in ldlm_lockd.c which are removed by this patch. Signed-off-by: Andreas Ruprecht Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c index b95f73cb5548..98fbd3f7e751 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c @@ -1051,7 +1051,7 @@ static int ldlm_setup(void) .so_req_handler = ldlm_callback_handler, }, }; - ldlm_state->ldlm_cb_service = \ + ldlm_state->ldlm_cb_service = ptlrpc_register_service(&conf, ldlm_svc_proc_dir); if (IS_ERR(ldlm_state->ldlm_cb_service)) { CERROR("failed to start service\n"); @@ -1079,7 +1079,7 @@ static int ldlm_setup(void) blp->blp_min_threads = LDLM_NTHRS_INIT; blp->blp_max_threads = LDLM_NTHRS_MAX; } else { - blp->blp_min_threads = blp->blp_max_threads = \ + blp->blp_min_threads = blp->blp_max_threads = min_t(int, LDLM_NTHRS_MAX, max_t(int, LDLM_NTHRS_INIT, ldlm_num_threads)); }