diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-04-24 09:40:51 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-05-08 13:03:05 +0200 |
| commit | bcebe324cb44f0298f6bb5fcb5eb92a3ec55feeb (patch) | |
| tree | 7633bdda6688354c06bda803f08c743fd1efa84d /lib | |
| parent | 15b28bbcd567a9199481ecfef39702b258f9baff (diff) | |
| download | linux-bcebe324cb44f0298f6bb5fcb5eb92a3ec55feeb.tar.bz2 | |
dma-debug: simplify counting of preallocated requests
Just keep a single variable with a descriptive name instead of two
with confusing names.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dma-debug.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index 712a897174e4..075253cb613b 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c @@ -132,7 +132,7 @@ static u32 min_free_entries; static u32 nr_total_entries; /* number of preallocated entries requested by kernel cmdline */ -static u32 req_entries; +static u32 nr_prealloc_entries = PREALLOC_DMA_DEBUG_ENTRIES; /* debugfs dentry's for the stuff above */ static struct dentry *dma_debug_dent __read_mostly; @@ -1011,7 +1011,6 @@ void dma_debug_add_bus(struct bus_type *bus) static int dma_debug_init(void) { - u32 num_entries; int i; /* Do not use dma_debug_initialized here, since we really want to be @@ -1032,12 +1031,7 @@ static int dma_debug_init(void) return 0; } - if (req_entries) - num_entries = req_entries; - else - num_entries = PREALLOC_DMA_DEBUG_ENTRIES; - - if (prealloc_memory(num_entries) != 0) { + if (prealloc_memory(nr_prealloc_entries) != 0) { pr_err("DMA-API: debugging out of memory error - disabled\n"); global_disable = true; @@ -1068,16 +1062,10 @@ static __init int dma_debug_cmdline(char *str) static __init int dma_debug_entries_cmdline(char *str) { - int res; - if (!str) return -EINVAL; - - res = get_option(&str, &req_entries); - - if (!res) - req_entries = 0; - + if (!get_option(&str, &nr_prealloc_entries)) + nr_prealloc_entries = PREALLOC_DMA_DEBUG_ENTRIES; return 0; } |