diff options
author | Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2015-03-10 05:37:24 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2015-03-16 12:41:06 -0400 |
commit | b26072276f20ce93717fdad5210e4ae9f1c944fa (patch) | |
tree | bcaddf54cf2f12cf57d4de4d8e17116166811411 /drivers/dma | |
parent | 550da64bc89b597395ea6e43a6b4026491035a9d (diff) |
dmaengine: dw: Make error prints unique. Part #2
The same error message is printed from different switch cases. Since both of
these jump into same error label we can move error print there and add a DMA
direction in order to make it easier to grep error from sources.
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/dw/core.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c index ac4fc0995a3e..a1c078d8cc85 100644 --- a/drivers/dma/dw/core.c +++ b/drivers/dma/dw/core.c | |||
@@ -815,11 +815,8 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, | |||
815 | 815 | ||
816 | slave_sg_todev_fill_desc: | 816 | slave_sg_todev_fill_desc: |
817 | desc = dwc_desc_get(dwc); | 817 | desc = dwc_desc_get(dwc); |
818 | if (!desc) { | 818 | if (!desc) |
819 | dev_err(chan2dev(chan), | ||
820 | "not enough descriptors available\n"); | ||
821 | goto err_desc_get; | 819 | goto err_desc_get; |
822 | } | ||
823 | 820 | ||
824 | desc->lli.sar = mem; | 821 | desc->lli.sar = mem; |
825 | desc->lli.dar = reg; | 822 | desc->lli.dar = reg; |
@@ -875,11 +872,8 @@ slave_sg_todev_fill_desc: | |||
875 | 872 | ||
876 | slave_sg_fromdev_fill_desc: | 873 | slave_sg_fromdev_fill_desc: |
877 | desc = dwc_desc_get(dwc); | 874 | desc = dwc_desc_get(dwc); |
878 | if (!desc) { | 875 | if (!desc) |
879 | dev_err(chan2dev(chan), | ||
880 | "not enough descriptors available\n"); | ||
881 | goto err_desc_get; | 876 | goto err_desc_get; |
882 | } | ||
883 | 877 | ||
884 | desc->lli.sar = reg; | 878 | desc->lli.sar = reg; |
885 | desc->lli.dar = mem; | 879 | desc->lli.dar = mem; |
@@ -923,6 +917,8 @@ slave_sg_fromdev_fill_desc: | |||
923 | return &first->txd; | 917 | return &first->txd; |
924 | 918 | ||
925 | err_desc_get: | 919 | err_desc_get: |
920 | dev_err(chan2dev(chan), | ||
921 | "not enough descriptors available. Direction %d\n", direction); | ||
926 | dwc_desc_put(dwc, first); | 922 | dwc_desc_put(dwc, first); |
927 | return NULL; | 923 | return NULL; |
928 | } | 924 | } |