Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2607227 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Vinod Koul
Browse files

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: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 550da64b

drivers/dma/dw/core.c

+4 −8
Original line number Diff line number Diff line
@@ -815,11 +815,8 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, 


slave_sg_todev_fill_desc:

			desc = dwc_desc_get(dwc);

			if (!desc) {

				dev_err(chan2dev(chan),

					"not enough descriptors available\n");

			if (!desc)

				goto err_desc_get;

			}



			desc->lli.sar = mem;

			desc->lli.dar = reg;
@@ -875,11 +872,8 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, 


slave_sg_fromdev_fill_desc:

			desc = dwc_desc_get(dwc);

			if (!desc) {

				dev_err(chan2dev(chan),

						"not enough descriptors available\n");

			if (!desc)

				goto err_desc_get;

			}



			desc->lli.sar = reg;

			desc->lli.dar = mem;
@@ -923,6 +917,8 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, 
	return &first->txd;



err_desc_get:

	dev_err(chan2dev(chan),

		"not enough descriptors available. Direction %d\n", direction);

	dwc_desc_put(dwc, first);

	return NULL;

}