dmatest: move src_off, dst_off, len inside loop

The scope of those varsiables is in while-loop. This patch moves them there and
removes duplicate code.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
Andy Shevchenko 2014-10-22 16:16:43 +03:00 committed by Vinod Koul
parent a835bb8550
commit ede23a5868
1 changed files with 12 additions and 11 deletions

View File

@ -405,7 +405,6 @@ static int dmatest_func(void *data)
struct dmatest_params *params; struct dmatest_params *params;
struct dma_chan *chan; struct dma_chan *chan;
struct dma_device *dev; struct dma_device *dev;
unsigned int src_off, dst_off, len;
unsigned int error_count; unsigned int error_count;
unsigned int failed_tests = 0; unsigned int failed_tests = 0;
unsigned int total_tests = 0; unsigned int total_tests = 0;
@ -484,6 +483,7 @@ static int dmatest_func(void *data)
struct dmaengine_unmap_data *um; struct dmaengine_unmap_data *um;
dma_addr_t srcs[src_cnt]; dma_addr_t srcs[src_cnt];
dma_addr_t *dsts; dma_addr_t *dsts;
unsigned int src_off, dst_off, len;
u8 align = 0; u8 align = 0;
total_tests++; total_tests++;
@ -502,15 +502,21 @@ static int dmatest_func(void *data)
break; break;
} }
if (params->noverify) { if (params->noverify)
len = params->buf_size; len = params->buf_size;
else
len = dmatest_random() % params->buf_size + 1;
len = (len >> align) << align;
if (!len)
len = 1 << align;
total_len += len;
if (params->noverify) {
src_off = 0; src_off = 0;
dst_off = 0; dst_off = 0;
} else { } else {
len = dmatest_random() % params->buf_size + 1;
len = (len >> align) << align;
if (!len)
len = 1 << align;
src_off = dmatest_random() % (params->buf_size - len + 1); src_off = dmatest_random() % (params->buf_size - len + 1);
dst_off = dmatest_random() % (params->buf_size - len + 1); dst_off = dmatest_random() % (params->buf_size - len + 1);
@ -523,11 +529,6 @@ static int dmatest_func(void *data)
params->buf_size); params->buf_size);
} }
len = (len >> align) << align;
if (!len)
len = 1 << align;
total_len += len;
um = dmaengine_get_unmap_data(dev->dev, src_cnt+dst_cnt, um = dmaengine_get_unmap_data(dev->dev, src_cnt+dst_cnt,
GFP_KERNEL); GFP_KERNEL);
if (!um) { if (!um) {