diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2019-06-11 10:58:24 -0700 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2019-06-11 14:36:33 -0400 |
| commit | 0bfaffbf4cc6f380a83eabc679c0d6eb307cf6e4 (patch) | |
| tree | 33771589de9ed876c0dfa5b7375dda30b858bba3 /kernel | |
| parent | 4e7372e0dc5d7d2078fbdb13505635cd5b11f93d (diff) | |
| download | linux-stable-0bfaffbf4cc6f380a83eabc679c0d6eb307cf6e4.tar.gz linux-stable-0bfaffbf4cc6f380a83eabc679c0d6eb307cf6e4.tar.bz2 linux-stable-0bfaffbf4cc6f380a83eabc679c0d6eb307cf6e4.zip | |
swiotlb: Group identical cleanup in swiotlb_cleanup()
Avoid repeating the zeroing of global swiotlb variables in two locations
and introduce swiotlb_cleanup() to do that.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/dma/swiotlb.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index 38d57218809c..20f414f713e5 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -309,6 +309,14 @@ swiotlb_late_init_with_default_size(size_t default_size) return rc; } +static void swiotlb_cleanup(void) +{ + io_tlb_end = 0; + io_tlb_start = 0; + io_tlb_nslabs = 0; + max_segment = 0; +} + int swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs) { @@ -359,10 +367,7 @@ cleanup4: sizeof(int))); io_tlb_list = NULL; cleanup3: - io_tlb_end = 0; - io_tlb_start = 0; - io_tlb_nslabs = 0; - max_segment = 0; + swiotlb_cleanup(); return -ENOMEM; } @@ -386,10 +391,7 @@ void __init swiotlb_exit(void) memblock_free_late(io_tlb_start, PAGE_ALIGN(io_tlb_nslabs << IO_TLB_SHIFT)); } - io_tlb_start = 0; - io_tlb_end = 0; - io_tlb_nslabs = 0; - max_segment = 0; + swiotlb_cleanup(); } /* |