diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2014-10-22 09:16:43 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2015-02-04 21:17:21 -0500 |
commit | ede23a586886bbd0d5246b2fa89cf78b81265aa3 (patch) | |
tree | 952821c2db79b8565d9952dc138acc632b1b3a1e | |
parent | a835bb8550f73c5e9aaf71ae829da86d34dcbe2b (diff) |
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>
-rw-r--r-- | drivers/dma/dmatest.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c index 87e5d9a75f16..220ee49633e4 100644 --- a/drivers/dma/dmatest.c +++ b/drivers/dma/dmatest.c | |||
@@ -405,7 +405,6 @@ static int dmatest_func(void *data) | |||
405 | struct dmatest_params *params; | 405 | struct dmatest_params *params; |
406 | struct dma_chan *chan; | 406 | struct dma_chan *chan; |
407 | struct dma_device *dev; | 407 | struct dma_device *dev; |
408 | unsigned int src_off, dst_off, len; | ||
409 | unsigned int error_count; | 408 | unsigned int error_count; |
410 | unsigned int failed_tests = 0; | 409 | unsigned int failed_tests = 0; |
411 | unsigned int total_tests = 0; | 410 | unsigned int total_tests = 0; |
@@ -484,6 +483,7 @@ static int dmatest_func(void *data) | |||
484 | struct dmaengine_unmap_data *um; | 483 | struct dmaengine_unmap_data *um; |
485 | dma_addr_t srcs[src_cnt]; | 484 | dma_addr_t srcs[src_cnt]; |
486 | dma_addr_t *dsts; | 485 | dma_addr_t *dsts; |
486 | unsigned int src_off, dst_off, len; | ||
487 | u8 align = 0; | 487 | u8 align = 0; |
488 | 488 | ||
489 | total_tests++; | 489 | total_tests++; |
@@ -502,15 +502,21 @@ static int dmatest_func(void *data) | |||
502 | break; | 502 | break; |
503 | } | 503 | } |
504 | 504 | ||
505 | if (params->noverify) { | 505 | if (params->noverify) |
506 | len = params->buf_size; | 506 | len = params->buf_size; |
507 | else | ||
508 | len = dmatest_random() % params->buf_size + 1; | ||
509 | |||
510 | len = (len >> align) << align; | ||
511 | if (!len) | ||
512 | len = 1 << align; | ||
513 | |||
514 | total_len += len; | ||
515 | |||
516 | if (params->noverify) { | ||
507 | src_off = 0; | 517 | src_off = 0; |
508 | dst_off = 0; | 518 | dst_off = 0; |
509 | } else { | 519 | } else { |
510 | len = dmatest_random() % params->buf_size + 1; | ||
511 | len = (len >> align) << align; | ||
512 | if (!len) | ||
513 | len = 1 << align; | ||
514 | src_off = dmatest_random() % (params->buf_size - len + 1); | 520 | src_off = dmatest_random() % (params->buf_size - len + 1); |
515 | dst_off = dmatest_random() % (params->buf_size - len + 1); | 521 | dst_off = dmatest_random() % (params->buf_size - len + 1); |
516 | 522 | ||
@@ -523,11 +529,6 @@ static int dmatest_func(void *data) | |||
523 | params->buf_size); | 529 | params->buf_size); |
524 | } | 530 | } |
525 | 531 | ||
526 | len = (len >> align) << align; | ||
527 | if (!len) | ||
528 | len = 1 << align; | ||
529 | total_len += len; | ||
530 | |||
531 | um = dmaengine_get_unmap_data(dev->dev, src_cnt+dst_cnt, | 532 | um = dmaengine_get_unmap_data(dev->dev, src_cnt+dst_cnt, |
532 | GFP_KERNEL); | 533 | GFP_KERNEL); |
533 | if (!um) { | 534 | if (!um) { |