Commit 883d29e0 authored by Nicolas Koch's avatar Nicolas Koch Committed by Greg Kroah-Hartman

Staging: octeon: minor style cleanups

Done as task 10 of the eudyptula challenge.
Signed-off-by: default avatarNicolas Koch <nioko1337@googlemail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ec3a2207
...@@ -46,9 +46,10 @@ ...@@ -46,9 +46,10 @@
static int cvm_oct_fill_hw_skbuff(int pool, int size, int elements) static int cvm_oct_fill_hw_skbuff(int pool, int size, int elements)
{ {
int freed = elements; int freed = elements;
while (freed) {
while (freed) {
struct sk_buff *skb = dev_alloc_skb(size + 256); struct sk_buff *skb = dev_alloc_skb(size + 256);
if (unlikely(skb == NULL)) if (unlikely(skb == NULL))
break; break;
skb_reserve(skb, 256 - (((unsigned long)skb->data) & 0x7f)); skb_reserve(skb, 256 - (((unsigned long)skb->data) & 0x7f));
...@@ -81,10 +82,10 @@ static void cvm_oct_free_hw_skbuff(int pool, int size, int elements) ...@@ -81,10 +82,10 @@ static void cvm_oct_free_hw_skbuff(int pool, int size, int elements)
if (elements < 0) if (elements < 0)
pr_warn("Freeing of pool %u had too many skbuffs (%d)\n", pr_warn("Freeing of pool %u had too many skbuffs (%d)\n",
pool, elements); pool, elements);
else if (elements > 0) else if (elements > 0)
pr_warn("Freeing of pool %u is missing %d skbuffs\n", pr_warn("Freeing of pool %u is missing %d skbuffs\n",
pool, elements); pool, elements);
} }
/** /**
...@@ -115,7 +116,7 @@ static int cvm_oct_fill_hw_memory(int pool, int size, int elements) ...@@ -115,7 +116,7 @@ static int cvm_oct_fill_hw_memory(int pool, int size, int elements)
memory = kmalloc(size + 256, GFP_ATOMIC); memory = kmalloc(size + 256, GFP_ATOMIC);
if (unlikely(memory == NULL)) { if (unlikely(memory == NULL)) {
pr_warn("Unable to allocate %u bytes for FPA pool %d\n", pr_warn("Unable to allocate %u bytes for FPA pool %d\n",
elements * size, pool); elements * size, pool);
break; break;
} }
fpa = (char *)(((unsigned long)memory + 256) & ~0x7fUL); fpa = (char *)(((unsigned long)memory + 256) & ~0x7fUL);
...@@ -136,6 +137,7 @@ static void cvm_oct_free_hw_memory(int pool, int size, int elements) ...@@ -136,6 +137,7 @@ static void cvm_oct_free_hw_memory(int pool, int size, int elements)
{ {
char *memory; char *memory;
char *fpa; char *fpa;
do { do {
fpa = cvmx_fpa_alloc(pool); fpa = cvmx_fpa_alloc(pool);
if (fpa) { if (fpa) {
...@@ -157,6 +159,7 @@ static void cvm_oct_free_hw_memory(int pool, int size, int elements) ...@@ -157,6 +159,7 @@ static void cvm_oct_free_hw_memory(int pool, int size, int elements)
int cvm_oct_mem_fill_fpa(int pool, int size, int elements) int cvm_oct_mem_fill_fpa(int pool, int size, int elements)
{ {
int freed; int freed;
if (USE_SKBUFFS_IN_HW && pool == CVMX_FPA_PACKET_POOL) if (USE_SKBUFFS_IN_HW && pool == CVMX_FPA_PACKET_POOL)
freed = cvm_oct_fill_hw_skbuff(pool, size, elements); freed = cvm_oct_fill_hw_skbuff(pool, size, elements);
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment