leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/swiotlb.c: cleanups

Browse Source 
There's a pointlessly braced block of code in there.  Remove the braces and
save a tabstop.

Cc: Andi Kleen <ak@suse.de>
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Jan Beulich <jbeulich@novell.com>
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andrew Morton 2008-04-29 00:59:36 -07:00 committed by Linus Torvalds
parent 9a3be324e3
commit a7133a1558
1 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/swiotlb.c
View File

@ -331,7 +331,6 @@ map_single(struct device *hwdev, char *buffer, size_t size, int dir)
* request and allocate a buffer from that IO TLB pool. * request and allocate a buffer from that IO TLB pool.
*/ */
spin_lock_irqsave(&io_tlb_lock, flags); spin_lock_irqsave(&io_tlb_lock, flags);
{
index = ALIGN(io_tlb_index, stride); index = ALIGN(io_tlb_index, stride);
if (index >= io_tlb_nslabs) if (index >= io_tlb_nslabs)
index = 0; index = 0;
@ -348,10 +347,9 @@ map_single(struct device *hwdev, char *buffer, size_t size, int dir)
} }
/* /*
* If we find a slot that indicates we have 'nslots' * If we find a slot that indicates we have 'nslots' number of
* number of contiguous buffers, we allocate the * contiguous buffers, we allocate the buffers from that slot
* buffers from that slot and mark the entries as '0' * and mark the entries as '0' indicating unavailable.
* indicating unavailable.
*/ */
if (io_tlb_list[index] >= nslots) { if (io_tlb_list[index] >= nslots) {
int count = 0; int count = 0;
@ -363,8 +361,8 @@ map_single(struct device *hwdev, char *buffer, size_t size, int dir)
dma_addr = io_tlb_start + (index << IO_TLB_SHIFT); dma_addr = io_tlb_start + (index << IO_TLB_SHIFT);
/* /*
* Update the indices to avoid searching in * Update the indices to avoid searching in the next
* the next round. * round.
*/ */
io_tlb_index = ((index + nslots) < io_tlb_nslabs io_tlb_index = ((index + nslots) < io_tlb_nslabs
? (index + nslots) : 0); ? (index + nslots) : 0);
@ -379,7 +377,6 @@ map_single(struct device *hwdev, char *buffer, size_t size, int dir)
not_found: not_found:
spin_unlock_irqrestore(&io_tlb_lock, flags); spin_unlock_irqrestore(&io_tlb_lock, flags);
return NULL; return NULL;
}
found: found:
spin_unlock_irqrestore(&io_tlb_lock, flags); spin_unlock_irqrestore(&io_tlb_lock, flags);