evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: et131x: Reduce split lines in et131x_rx_dma_memory_alloc()

Browse source 
Modify temporary variables so that split lines can be reduced:

index -> k
fbr_tmp_physaddr -> fbr_physaddr

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mark Einon 2014-09-22 20:58:13 +01:00 • committed by Greg Kroah-Hartman
parent 3b11d00df7
commit a02a26f0d6
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/staging/et131x/et131x.c
View file

@ -2070,7 +2070,7 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
fbr_chunksize = (FBR_CHUNKS * fbr->buffsize); fbr_chunksize = (FBR_CHUNKS * fbr->buffsize);
for (i = 0; i < fbr->num_entries / FBR_CHUNKS; i++) { for (i = 0; i < fbr->num_entries / FBR_CHUNKS; i++) {
dma_addr_t fbr_tmp_physaddr; dma_addr_t fbr_physaddr;
fbr->mem_virtaddrs[i] = dma_alloc_coherent( fbr->mem_virtaddrs[i] = dma_alloc_coherent(
&adapter->pdev->dev, fbr_chunksize, &adapter->pdev->dev, fbr_chunksize,
@ -2084,26 +2084,23 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
} }
/* See NOTE in "Save Physical Address" comment above */ /* See NOTE in "Save Physical Address" comment above */
fbr_tmp_physaddr = fbr->mem_physaddrs[i]; fbr_physaddr = fbr->mem_physaddrs[i];
for (j = 0; j < FBR_CHUNKS; j++) { for (j = 0; j < FBR_CHUNKS; j++) {
u32 index = (i * FBR_CHUNKS) + j; u32 k = (i * FBR_CHUNKS) + j;
/* Save the Virtual address of this index for /* Save the Virtual address of this index for
* quick access later * quick access later
*/ */
fbr->virt[index] = (u8 *)fbr->mem_virtaddrs[i] + fbr->virt[k] = (u8 *)fbr->mem_virtaddrs[i] +
(j * fbr->buffsize); (j * fbr->buffsize);
/* now store the physical address in the /* now store the physical address in the
* descriptor so the device can access it * descriptor so the device can access it
*/ */
fbr->bus_high[index] = fbr->bus_high[k] = upper_32_bits(fbr_physaddr);
upper_32_bits(fbr_tmp_physaddr); fbr->bus_low[k] = lower_32_bits(fbr_physaddr);
fbr->bus_low[index] = fbr_physaddr += fbr->buffsize;
lower_32_bits(fbr_tmp_physaddr);
fbr_tmp_physaddr += fbr->buffsize;
} }
} }
} }