Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752038AbdDCVNq (ORCPT ); Mon, 3 Apr 2017 17:13:46 -0400 Received: from o1678950229.outbound-mail.sendgrid.net ([167.89.50.229]:22110 "EHLO o1678950229.outbound-mail.sendgrid.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751406AbdDCVNp (ORCPT ); Mon, 3 Apr 2017 17:13:45 -0400 From: Craig Inches To: oleg.drokin@intel.com, andreas.dilger@intel.com, jsimmons@infradead.org, gregkh@linuxfoundation.org, john.hammond@intel.com Cc: lustre-devel@lists.lustre.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Craig Inches Subject: [PATCH] Staging: lustre cleanup macros in libcfs_private.h Date: Mon, 3 Apr 2017 22:13:29 +0100 Message-Id: <20170403211329.20264-1-Craig@craiginches.com> X-Mailer: git-send-email 2.10.2 X-SG-EID: UsLXQ589HNP4HLBydmD9pgHURQozLYm9XliudupI8Ys/q/nKmWPuD7HpB0+gv2kybVT0qItkFvDfDA 5QyaM0oJpyDYzoW2OP6NYQQC5Tn0RCBPQa053hcvRYq8ijZsuUCYnygJmpwdL5HnBpOOdnWTGB6nIY tp7Fc/DMx1tgTi+18JYStIQNMqshaIryPKv+/3guX2fAvFhqiwK8yhgqtLcipC/3ywad9qLQhgJwDh U= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3224 Lines: 90 This resolves a checkpatch warning that "Single statement macros should not use a do {} while (0) loop" by removing the loop and adjusting line length accordingly. Signed-off-by: Craig Inches --- .../lustre/include/linux/libcfs/libcfs_private.h | 51 +++++++--------------- 1 file changed, 15 insertions(+), 36 deletions(-) diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h index 2dae857..150454f 100644 --- a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h +++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h @@ -87,12 +87,9 @@ do { \ #define LIBCFS_VMALLOC_SIZE (2 << PAGE_SHIFT) /* 2 pages */ #endif -#define LIBCFS_ALLOC_PRE(size, mask) \ -do { \ - LASSERT(!in_interrupt() || \ - ((size) <= LIBCFS_VMALLOC_SIZE && \ - !gfpflags_allow_blocking(mask))); \ -} while (0) +#define LIBCFS_ALLOC_PRE(size, mask) \ + LASSERT(!in_interrupt() || ((size) <= LIBCFS_VMALLOC_SIZE \ + && !gfpflags_allow_blocking(mask))) #define LIBCFS_ALLOC_POST(ptr, size) \ do { \ @@ -187,46 +184,28 @@ void cfs_array_free(void *vars); #if LASSERT_ATOMIC_ENABLED /** assert value of @a is equal to @v */ -#define LASSERT_ATOMIC_EQ(a, v) \ -do { \ - LASSERTF(atomic_read(a) == v, \ - "value: %d\n", atomic_read((a))); \ -} while (0) +#define LASSERT_ATOMIC_EQ(a, v) LASSERTF(atomic_read(a) == v, \ + "value: %d\n", atomic_read((a))) /** assert value of @a is unequal to @v */ -#define LASSERT_ATOMIC_NE(a, v) \ -do { \ - LASSERTF(atomic_read(a) != v, \ - "value: %d\n", atomic_read((a))); \ -} while (0) +#define LASSERT_ATOMIC_NE(a, v) LASSERTF(atomic_read(a) != v, \ + "value: %d\n", atomic_read((a))) /** assert value of @a is little than @v */ -#define LASSERT_ATOMIC_LT(a, v) \ -do { \ - LASSERTF(atomic_read(a) < v, \ - "value: %d\n", atomic_read((a))); \ -} while (0) +#define LASSERT_ATOMIC_LT(a, v) LASSERTF(atomic_read(a) < v, \ + "value: %d\n", atomic_read((a))) /** assert value of @a is little/equal to @v */ -#define LASSERT_ATOMIC_LE(a, v) \ -do { \ - LASSERTF(atomic_read(a) <= v, \ - "value: %d\n", atomic_read((a))); \ -} while (0) +#define LASSERT_ATOMIC_LE(a, v) LASSERTF(atomic_read(a) <= v, \ + "value: %d\n", atomic_read((a))) /** assert value of @a is great than @v */ -#define LASSERT_ATOMIC_GT(a, v) \ -do { \ - LASSERTF(atomic_read(a) > v, \ - "value: %d\n", atomic_read((a))); \ -} while (0) +#define LASSERT_ATOMIC_GT(a, v) LASSERTF(atomic_read(a) > v, \ + "value: %d\n", atomic_read((a))) /** assert value of @a is great/equal to @v */ -#define LASSERT_ATOMIC_GE(a, v) \ -do { \ - LASSERTF(atomic_read(a) >= v, \ - "value: %d\n", atomic_read((a))); \ -} while (0) +#define LASSERT_ATOMIC_GE(a, v) LASSERTF(atomic_read(a) >= v, \ + "value: %d\n", atomic_read((a))) /** assert value of @a is great than @v1 and little than @v2 */ #define LASSERT_ATOMIC_GT_LT(a, v1, v2) \ -- 2.10.2