Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1335016

[PATCH 41/45] staging/lustre/libcfs: Get rid of multiple assignments

From green@linuxhacker.ru
Newsgroups linux.kernel
Subject [PATCH 41/45] staging/lustre/libcfs: Get rid of multiple assignments
Date 2016-02-16 06:50 +0100
Message-ID <r2GGn-3pA-37@gated-at.bofh.it> (permalink)
References <r2GGm-3pA-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


From: Oleg Drokin <green@linuxhacker.ru>

They make checkpatch unhappy, and I guess overall might confuse
people too.

Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
---
 drivers/staging/lustre/lustre/libcfs/libcfs_mem.c    | 7 ++++---
 drivers/staging/lustre/lustre/libcfs/libcfs_string.c | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_mem.c b/drivers/staging/lustre/lustre/libcfs/libcfs_mem.c
index 7396d66..c5a6951 100644
--- a/drivers/staging/lustre/lustre/libcfs/libcfs_mem.c
+++ b/drivers/staging/lustre/lustre/libcfs/libcfs_mem.c
@@ -82,9 +82,10 @@ cfs_percpt_alloc(struct cfs_cpt_table *cptab, unsigned int size)
 	if (!arr)
 		return NULL;
 
-	arr->va_size	= size = L1_CACHE_ALIGN(size);
-	arr->va_count	= count;
-	arr->va_cptab	= cptab;
+	size = L1_CACHE_ALIGN(size);
+	arr->va_size = size;
+	arr->va_count = count;
+	arr->va_cptab = cptab;
 
 	for (i = 0; i < count; i++) {
 		LIBCFS_CPT_ALLOC(arr->va_ptrs[i], cptab, i, size);
diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_string.c b/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
index 4a2c83b..09ab0e4 100644
--- a/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
+++ b/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
@@ -337,8 +337,10 @@ cfs_range_expr_print(char *buffer, int count, struct cfs_range_expr *expr,
 	char s[] = "[";
 	char e[] = "]";
 
-	if (bracketed)
-		s[0] = e[0] = '\0';
+	if (bracketed) {
+		s[0] = '\0';
+		e[0] = '\0';
+	}
 
 	if (expr->re_lo == expr->re_hi)
 		i = scnprintf(buffer, count, "%u", expr->re_lo);
-- 
2.1.0

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 00/45] Lustre cleanups green@linuxhacker.ru - 2016-02-16 06:50 +0100
  [PATCH 43/45] staging/lustre/libcfs: Replace use of printk with pr_<level> green@linuxhacker.ru - 2016-02-16 06:50 +0100
    Re: [PATCH 43/45] staging/lustre/libcfs: Replace use of printk with  pr_<level> Joe Perches <joe@perches.com> - 2016-02-16 07:00 +0100
      Re: [PATCH 43/45] staging/lustre/libcfs: Replace use of printk with pr_<level> Oleg Drokin <green@linuxhacker.ru> - 2016-02-16 17:20 +0100
        Re: [PATCH 43/45] staging/lustre/libcfs: Replace use of printk with  pr_<level> Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-02-20 23:40 +0100
  [PATCH 41/45] staging/lustre/libcfs: Get rid of multiple assignments green@linuxhacker.ru - 2016-02-16 06:50 +0100
  [PATCH 45/45] staging/lustre: Convert cfs_str2num_check to use kstrtoul green@linuxhacker.ru - 2016-02-16 06:50 +0100
  [PATCH 44/45] staging/lustre: Convert cfs_trace_daemon_command to use kstrtoul green@linuxhacker.ru - 2016-02-16 06:50 +0100
  [PATCH 34/45] staging/lustre/libcfs: Remove unused cfs_tcd_owns_tage() function green@linuxhacker.ru - 2016-02-16 06:50 +0100
  [PATCH 32/45] staging/lustre/libcfs: Remove stray spaces after function name green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 39/45] staging/lustre: Update cfs_cpu_notify switch statement with a comment green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 38/45] staging/lustre/libcfs: Remove empty lines after/before braces green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 40/45] staging/lustre: Get rid of cfs_trace_buf_type_t typedef green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 37/45] staging/lustre/libcfs: Remove useless returns in void functions green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 19/45] staging/lustre/lclient: Adjust NULL comparison codestyle green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 31/45] staging/lustre/libcfs: reformat cfs_tcd_for_each_type_lock define green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 22/45] staging/lustre/mgc: Adjust NULL comparison codestyle green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 27/45] staging/lustre: Remove the "write to FSF to get a copy of GPL" wording green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 20/45] staging/lustre/include: Adjust NULL comparison codestyle green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 29/45] staging/lustre/libcfs: Move EXPORT_SYMBOLs under function/variable green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 15/45] staging/lustre/ldlm: Adjust NULL comparison codestyle green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 33/45] staging/lustre/libcfs: Shortened too long lines green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 16/45] staging/lustre/lmv: Adjust NULL comparison codestyle green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 18/45] staging/lustre/fld: Adjust NULL comparison codestyle green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 21/45] staging/lustre/mdc: Adjust NULL comparison codestyle green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 30/45] staging/lustre/libcfs: style change to add missing spaces for operations green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 28/45] staging/lustre/libcfs: Cleanup: parenthesis alignment adjustments green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 42/45] staging/lustre: Remove space after cast in cfs_crypto_hash_final() green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 07/45] staging/lustre: Remove unused osc_on_mdt function green@linuxhacker.ru - 2016-02-16 07:10 +0100
  [PATCH 06/45] staging/lustre: Remove unused function oti_init green@linuxhacker.ru - 2016-02-16 07:10 +0100
  [PATCH 10/45] staging/lustre: Remove commented out lock_lock_multi_match green@linuxhacker.ru - 2016-02-16 07:10 +0100
  [PATCH 09/45] staging/lustre: Remove server code from class_get_type() green@linuxhacker.ru - 2016-02-16 07:10 +0100
  [PATCH 11/45] staging/lustre/osc: Remove commented out osc_page_protected() green@linuxhacker.ru - 2016-02-16 07:10 +0100
  [PATCH 04/45] staging/lustre/llite: Get rid of /proc references in comments green@linuxhacker.ru - 2016-02-16 07:10 +0100
  [PATCH 05/45] staging/lustre/lov: Get rid of /proc references in comments green@linuxhacker.ru - 2016-02-16 07:10 +0100
  [PATCH 02/45] staging/lustre/obdclass: Get rid of /proc references in comments. green@linuxhacker.ru - 2016-02-16 07:10 +0100

csiph-web