[PATCH 6/6] Staging: ozwpan: fixing coding style issues
Adnan Ali
adnan.ali at codethink.co.uk
Mon May 28 15:45:30 UTC 2012
This commit fixes coding style issue including string split across
multiple lines and checking resource validity before calling kfree()
to release resource.
Signed-off-by: Adnan Ali <adnan.ali at codethink.co.uk>
---
drivers/staging/ozwpan/ozeltbuf.c | 4 ++--
drivers/staging/ozwpan/ozhcd.c | 3 +--
drivers/staging/ozwpan/ozpd.c | 6 ++----
drivers/staging/ozwpan/ozproto.c | 3 +--
4 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/ozwpan/ozeltbuf.c b/drivers/staging/ozwpan/ozeltbuf.c
index 988f522..941a5f0 100644
--- a/drivers/staging/ozwpan/ozeltbuf.c
+++ b/drivers/staging/ozwpan/ozeltbuf.c
@@ -104,8 +104,8 @@ void oz_elt_info_free(struct oz_elt_buf *buf, struct oz_elt_info *ei)
buf->elt_pool = &ei->link;
ei->magic = OZ_ELT_INFO_MAGIC_FREE;
} else {
- oz_trace("oz_elt_info_free: bad magic ei: %p"
- " magic: 0x%x\n",
+ oz_trace(
+ "oz_elt_info_free: bad magic ei: %p magic: 0x%x\n",
ei, ei->magic);
}
}
diff --git a/drivers/staging/ozwpan/ozhcd.c b/drivers/staging/ozwpan/ozhcd.c
index 251f07c..28d7459 100644
--- a/drivers/staging/ozwpan/ozhcd.c
+++ b/drivers/staging/ozwpan/ozhcd.c
@@ -278,8 +278,7 @@ static void oz_free_urb_link(struct oz_urb_link *urbl)
g_link_pool_size++;
}
spin_unlock_irqrestore(&g_link_lock, irq_state);
- if (urbl)
- kfree(urbl);
+ kfree(urbl);
}
}
/*------------------------------------------------------------------------------
diff --git a/drivers/staging/ozwpan/ozpd.c b/drivers/staging/ozwpan/ozpd.c
index 04cd57f..ebbfa26 100644
--- a/drivers/staging/ozwpan/ozpd.c
+++ b/drivers/staging/ozwpan/ozpd.c
@@ -385,8 +385,7 @@ static void oz_tx_frame_free(struct oz_pd *pd, struct oz_tx_frame *f)
f = 0;
}
spin_unlock_bh(&pd->tx_frame_lock);
- if (f)
- kfree(f);
+ kfree(f);
}
/*------------------------------------------------------------------------------
* Context: softirq
@@ -655,8 +654,7 @@ int oz_isoc_stream_create(struct oz_pd *pd, u8 ep_num)
st = 0;
}
spin_unlock_bh(&pd->stream_lock);
- if (st)
- kfree(st);
+ kfree(st);
return 0;
}
/*------------------------------------------------------------------------------
diff --git a/drivers/staging/ozwpan/ozproto.c b/drivers/staging/ozwpan/ozproto.c
index ad857ee..cebf535 100644
--- a/drivers/staging/ozwpan/ozproto.c
+++ b/drivers/staging/ozwpan/ozproto.c
@@ -555,8 +555,7 @@ static void oz_protocol_timer(unsigned long arg)
}
spin_unlock_bh(&g_polling_lock);
oz_pd_put(pd);
- if (t)
- kfree(t);
+ kfree(t);
t = t2;
} while (t);
g_timer_state = OZ_TIMER_IDLE;
--
1.7.4.1
More information about the devel
mailing list