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>

diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index 712a897174e41b330ba3c881848f73ab5e146e99..075253cb613b15f1f842702c9208cc7dc67cf9d1 100644 (file)
--- 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;
 }