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

Groups > linux.kernel > #1208201

[PATCH 1/3] staging: wilc1000: code style: fix macro with multiple statements

Show all headers | View raw

Macros with multiple statements should be enclosed in a do - while loop

Signed-off-by: Raphaël Beamonte <raphael.beamonte@gmail.com>
---
 drivers/staging/wilc1000/wilc_exported_buf.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_exported_buf.c b/drivers/staging/wilc1000/wilc_exported_buf.c
index 5294578..45c2c7e 100644
--- a/drivers/staging/wilc1000/wilc_exported_buf.c
+++ b/drivers/staging/wilc1000/wilc_exported_buf.c
@@ -12,11 +12,13 @@
 	void *exported_ ## name = NULL;
 
 #define MALLOC_WILC_BUFFER(name, size)	\
-	exported_ ## name = kmalloc(size, GFP_KERNEL);	  \
-	if (!exported_ ## name) {   \
-		printk("fail to alloc: %s memory\n", exported_ ## name);  \
-		return -ENOBUFS;	\
-	}
+	do { \
+		exported_ ## name = kmalloc(size, GFP_KERNEL);	  \
+		if (!exported_ ## name) {   \
+			printk("fail to alloc: %s memory\n", exported_ ## name);  \
+			return -ENOBUFS;	\
+		}
+	} while (0)
 
 #define FREE_WILC_BUFFER(name)	\
 	kfree(exported_ ## name);
@@ -73,4 +75,4 @@ MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Tony Cho");
 MODULE_DESCRIPTION("WILC1xxx Memory Manager");
 pure_initcall(wilc_module_init);
-module_exit(wilc_module_deinit);
\ No newline at end of file
+module_exit(wilc_module_deinit);
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

Thread

[PATCH 1/3] staging: wilc1000: code style: fix macro with multiple statements Raphaël Beamonte <raphael.beamonte@gmail.com> - 2015-08-16 07:40 +0200
  Re: [PATCH 1/3] staging: wilc1000: code style: fix macro with  multiple statements Dan Carpenter <dan.carpenter@oracle.com> - 2015-08-17 11:10 +0200
    Re: [PATCH 1/3] staging: wilc1000: code style: fix macro with  multiple statements Raphaël Beamonte <raphael.beamonte@gmail.com> - 2015-08-17 16:50 +0200
      [PATCH 0/5] staging: wilc1000: code improvements Raphaël Beamonte <raphael.beamonte@gmail.com> - 2015-08-17 18:10 +0200
        [PATCH 5/5] staging: wilc1000: remove void function return statements that are not useful Raphaël Beamonte <raphael.beamonte@gmail.com> - 2015-08-17 18:10 +0200
        [PATCH 2/5] staging: wilc1000: remove FREE_WILC_BUFFER() Raphaël Beamonte <raphael.beamonte@gmail.com> - 2015-08-17 18:20 +0200
          Re: [PATCH 2/5] staging: wilc1000: remove FREE_WILC_BUFFER() Dan Carpenter <dan.carpenter@oracle.com> - 2015-08-17 19:50 +0200
        [PATCHv2 0/5] staging: wilc1000: code improvements Raphaël Beamonte <raphael.beamonte@gmail.com> - 2015-08-17 21:30 +0200
          [PATCHv2 1/5] staging: wilc1000: remove void function return statements that are not useful Raphaël Beamonte <raphael.beamonte@gmail.com> - 2015-08-17 21:30 +0200
          [PATCHv2 3/5] staging: wilc1000: remove DECLARE_WILC_BUFFER() Raphaël Beamonte <raphael.beamonte@gmail.com> - 2015-08-17 21:40 +0200

csiph-web