staging: ozwpan: Remove allocation from delaration line

PATCH Superseded Quentin Lambert 2 participants 2 messages Feb 10, 2015

Subsystems (2)

Staging Kernel janitors

lore

Share & tools

lore

Quentin Lambert

author

2015-02-10 08:54 UTC #0 lore raw

PATCH 1/1 staging: ozwpan: Remove allocation from delaration line

This patch removes allocation from declaration line because people are known to gloss over declarations.

Signed-off-by Quentin Lambert <[email protected]>

---
This patch was inspired by http://www.spinics.net/lists/linux-usb/msg44389.html
and https://lkml.org/lkml/2015/2/7/47 but I am not sure the argument is valid in the case of a single declaration.

 drivers/staging/ozwpan/ozhcd.c |  6 ++++--
 drivers/staging/ozwpan/ozpd.c  | 10 +++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

drivers/staging/ozwpan/ozhcd.c +4 -2

index 8543bb2..230ba08 100644
@@ -280,8 +280,10 @@ static void oz_free_urb_link(struct oz_urb_link *urbl)
  */
 static struct oz_endpoint *oz_ep_alloc(int buffer_size, gfp_t mem_flags)
 {
-	struct oz_endpoint *ep =
-		kzalloc(sizeof(struct oz_endpoint)+buffer_size, mem_flags);
+	struct oz_endpoint *ep;
+
+	ep = kzalloc(sizeof(struct oz_endpoint)+buffer_size, mem_flags);
+
 	if (ep) {
 		INIT_LIST_HEAD(&ep->urb_list);
 		INIT_LIST_HEAD(&ep->link);

drivers/staging/ozwpan/ozpd.c +7 -3

index 852c288..3cc5f14 100644
@@ -102,7 +102,9 @@ void oz_pd_put(struct oz_pd *pd)
  */
 struct oz_pd *oz_pd_alloc(const u8 *mac_addr)
 {
-	struct oz_pd *pd = kzalloc(sizeof(struct oz_pd), GFP_ATOMIC);
+	struct oz_pd *pd;
+
+	pd = kzalloc(sizeof(struct oz_pd), GFP_ATOMIC);
 
 	if (pd) {
 		int i;

@@ -652,8 +654,10 @@ static struct oz_isoc_stream *pd_stream_find(struct oz_pd *pd, u8 ep_num)
  */
 int oz_isoc_stream_create(struct oz_pd *pd, u8 ep_num)
 {
-	struct oz_isoc_stream *st =
-		kzalloc(sizeof(struct oz_isoc_stream), GFP_ATOMIC);
+	struct oz_isoc_stream *st;
+
+	st = kzalloc(sizeof(struct oz_isoc_stream), GFP_ATOMIC);
+
 	if (!st)
 		return -ENOMEM;
 	st->ep_num = ep_num;

Signature · 1 line

1.9.1

Dan Carpenter

2015-02-10 10:10 UTC #1 lore raw

drivers/staging/ozwpan/ozhcd.c static void oz_free_urb_link(struct oz_urb_link *urbl) · line 287

Quoted 8 lines · Quentin Lambert

static struct oz_endpoint *oz_ep_alloc(int buffer_size, gfp_t mem_flags) {
drivers/staging/ozwpan/ozhcd.c +4 -1
-	struct oz_endpoint *ep > -		kzalloc(sizeof(struct oz_endpoint)+buffer_size, mem_flags);
+	struct oz_endpoint *ep;
+
+	ep = kzalloc(sizeof(struct oz_endpoint)+buffer_size, mem_flags);
+
 	if (ep) {

Don't put a blank line between the function and the test. They are part of the same thing.

Also in a later patch, could you reverse the "if (ep) " to

	if (!ep)
		return NULL;

The original code is "success handling" not "error handling".

regards,
dan carpenter