Skip to content

Commit

Permalink
staging: et131x: Reduce indenting in et131x_rx_dma_memory_free()
Browse files Browse the repository at this point in the history
This change negates an 'if' statement, allowing a large block of code
to be un-indented, making the code more readable.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Mark Einon authored and Greg Kroah-Hartman committed Nov 21, 2012
1 parent 1a2bd6b commit 823bb2e
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions drivers/staging/et131x/et131x.c
Original file line number Diff line number Diff line change
Expand Up @@ -2443,33 +2443,33 @@ static void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)

/* Free Free Buffer Rings */
for (id = 0; id < NUM_FBRS; id++) {
if (rx_ring->fbr[id]->ring_virtaddr) {
/* First the packet memory */
for (index = 0; index <
(rx_ring->fbr[id]->num_entries / FBR_CHUNKS);
index++) {
if (rx_ring->fbr[id]->mem_virtaddrs[index]) {
if (!rx_ring->fbr[id]->ring_virtaddr)
continue;

bufsize = (rx_ring->fbr[id]->buffsize * FBR_CHUNKS);
/* First the packet memory */
for (index = 0;
index < (rx_ring->fbr[id]->num_entries / FBR_CHUNKS);
index++) {
if (rx_ring->fbr[id]->mem_virtaddrs[index]) {
bufsize = rx_ring->fbr[id]->buffsize * FBR_CHUNKS;

dma_free_coherent(&adapter->pdev->dev,
bufsize,
rx_ring->fbr[id]->mem_virtaddrs[index],
rx_ring->fbr[id]->mem_physaddrs[index]);
dma_free_coherent(&adapter->pdev->dev,
bufsize,
rx_ring->fbr[id]->mem_virtaddrs[index],
rx_ring->fbr[id]->mem_physaddrs[index]);

rx_ring->fbr[id]->mem_virtaddrs[index] = NULL;
}
rx_ring->fbr[id]->mem_virtaddrs[index] = NULL;
}
}

bufsize =
sizeof(struct fbr_desc) * rx_ring->fbr[id]->num_entries;
bufsize =
sizeof(struct fbr_desc) * rx_ring->fbr[id]->num_entries;

dma_free_coherent(&adapter->pdev->dev, bufsize,
rx_ring->fbr[id]->ring_virtaddr,
rx_ring->fbr[id]->ring_physaddr);
dma_free_coherent(&adapter->pdev->dev, bufsize,
rx_ring->fbr[id]->ring_virtaddr,
rx_ring->fbr[id]->ring_physaddr);

rx_ring->fbr[id]->ring_virtaddr = NULL;
}
rx_ring->fbr[id]->ring_virtaddr = NULL;
}

/* Free Packet Status Ring */
Expand Down

0 comments on commit 823bb2e

Please sign in to comment.