diff options
author | Dan Williams <dan.j.williams@intel.com> | 2013-11-06 19:30:00 -0500 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2013-11-14 14:04:39 -0500 |
commit | 0adff800662f52d0ffc3e420db231769cb3fff13 (patch) | |
tree | 897139c520d7bb33d2e642fb4dd485b34cc2f647 /drivers/dma | |
parent | 872f05c6e9a37e9358fd58eb54deee7337863496 (diff) |
dmatest: cleanup redundant "dmatest: " prefixes
...now that we have a common pr_fmt.
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/dmatest.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c index 58b195f9d03c..15199edcc366 100644 --- a/drivers/dma/dmatest.c +++ b/drivers/dma/dmatest.c | |||
@@ -623,8 +623,8 @@ static void dmatest_cleanup_channel(struct dmatest_chan *dtc) | |||
623 | 623 | ||
624 | list_for_each_entry_safe(thread, _thread, &dtc->threads, node) { | 624 | list_for_each_entry_safe(thread, _thread, &dtc->threads, node) { |
625 | ret = kthread_stop(thread->task); | 625 | ret = kthread_stop(thread->task); |
626 | pr_debug("dmatest: thread %s exited with status %d\n", | 626 | pr_debug("thread %s exited with status %d\n", |
627 | thread->task->comm, ret); | 627 | thread->task->comm, ret); |
628 | list_del(&thread->node); | 628 | list_del(&thread->node); |
629 | kfree(thread); | 629 | kfree(thread); |
630 | } | 630 | } |
@@ -656,9 +656,8 @@ static int dmatest_add_threads(struct dmatest_info *info, | |||
656 | for (i = 0; i < params->threads_per_chan; i++) { | 656 | for (i = 0; i < params->threads_per_chan; i++) { |
657 | thread = kzalloc(sizeof(struct dmatest_thread), GFP_KERNEL); | 657 | thread = kzalloc(sizeof(struct dmatest_thread), GFP_KERNEL); |
658 | if (!thread) { | 658 | if (!thread) { |
659 | pr_warning("dmatest: No memory for %s-%s%u\n", | 659 | pr_warn("No memory for %s-%s%u\n", |
660 | dma_chan_name(chan), op, i); | 660 | dma_chan_name(chan), op, i); |
661 | |||
662 | break; | 661 | break; |
663 | } | 662 | } |
664 | thread->info = info; | 663 | thread->info = info; |
@@ -668,8 +667,8 @@ static int dmatest_add_threads(struct dmatest_info *info, | |||
668 | thread->task = kthread_run(dmatest_func, thread, "%s-%s%u", | 667 | thread->task = kthread_run(dmatest_func, thread, "%s-%s%u", |
669 | dma_chan_name(chan), op, i); | 668 | dma_chan_name(chan), op, i); |
670 | if (IS_ERR(thread->task)) { | 669 | if (IS_ERR(thread->task)) { |
671 | pr_warning("dmatest: Failed to run thread %s-%s%u\n", | 670 | pr_warn("Failed to run thread %s-%s%u\n", |
672 | dma_chan_name(chan), op, i); | 671 | dma_chan_name(chan), op, i); |
673 | kfree(thread); | 672 | kfree(thread); |
674 | break; | 673 | break; |
675 | } | 674 | } |
@@ -692,7 +691,7 @@ static int dmatest_add_channel(struct dmatest_info *info, | |||
692 | 691 | ||
693 | dtc = kmalloc(sizeof(struct dmatest_chan), GFP_KERNEL); | 692 | dtc = kmalloc(sizeof(struct dmatest_chan), GFP_KERNEL); |
694 | if (!dtc) { | 693 | if (!dtc) { |
695 | pr_warning("dmatest: No memory for %s\n", dma_chan_name(chan)); | 694 | pr_warn("No memory for %s\n", dma_chan_name(chan)); |
696 | return -ENOMEM; | 695 | return -ENOMEM; |
697 | } | 696 | } |
698 | 697 | ||
@@ -712,7 +711,7 @@ static int dmatest_add_channel(struct dmatest_info *info, | |||
712 | thread_count += cnt > 0 ? cnt : 0; | 711 | thread_count += cnt > 0 ? cnt : 0; |
713 | } | 712 | } |
714 | 713 | ||
715 | pr_info("dmatest: Started %u threads using %s\n", | 714 | pr_info("Started %u threads using %s\n", |
716 | thread_count, dma_chan_name(chan)); | 715 | thread_count, dma_chan_name(chan)); |
717 | 716 | ||
718 | list_add_tail(&dtc->node, &info->channels); | 717 | list_add_tail(&dtc->node, &info->channels); |
@@ -779,7 +778,7 @@ static void __stop_threaded_test(struct dmatest_info *info) | |||
779 | list_del(&dtc->node); | 778 | list_del(&dtc->node); |
780 | chan = dtc->chan; | 779 | chan = dtc->chan; |
781 | dmatest_cleanup_channel(dtc); | 780 | dmatest_cleanup_channel(dtc); |
782 | pr_debug("dmatest: dropped channel %s\n", dma_chan_name(chan)); | 781 | pr_debug("dropped channel %s\n", dma_chan_name(chan)); |
783 | dma_release_channel(chan); | 782 | dma_release_channel(chan); |
784 | } | 783 | } |
785 | 784 | ||
@@ -906,7 +905,7 @@ static int dmatest_register_dbgfs(struct dmatest_info *info) | |||
906 | return 0; | 905 | return 0; |
907 | 906 | ||
908 | err_root: | 907 | err_root: |
909 | pr_err("dmatest: Failed to initialize debugfs\n"); | 908 | pr_err("Failed to initialize debugfs\n"); |
910 | return -ENOMEM; | 909 | return -ENOMEM; |
911 | } | 910 | } |
912 | 911 | ||