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

Commit 78c6e1a5 authored by Markus Elfring's avatar Markus Elfring Committed by Vinod Koul
Browse files

ste_dma40: One check less in d40_prep_sg() after error detection 



* Adjust jump targets according to the Linux coding style convention.

* Delete a repeated check which became unnecessary with this refactoring.

Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 8452b859

drivers/dma/ste_dma40.c

+5 −6
Original line number Diff line number Diff line
@@ -2253,7 +2253,7 @@ d40_prep_sg(struct dma_chan *dchan, struct scatterlist *sg_src, 


	desc = d40_prep_desc(chan, sg_src, sg_len, dma_flags);

	if (desc == NULL)

		goto err;

		goto unlock;



	if (sg_next(&sg_src[sg_len - 1]) == sg_src)

		desc->cyclic = true;
@@ -2273,7 +2273,7 @@ d40_prep_sg(struct dma_chan *dchan, struct scatterlist *sg_src, 
	if (ret) {

		chan_err(chan, "Failed to prepare %s sg job: %d\n",

			 chan_is_logical(chan) ? "log" : "phy", ret);

		goto err;

		goto free_desc;

	}



	/*
@@ -2285,10 +2285,9 @@ d40_prep_sg(struct dma_chan *dchan, struct scatterlist *sg_src, 
	spin_unlock_irqrestore(&chan->lock, flags);



	return &desc->txd;



err:

	if (desc)

 free_desc:

	d40_desc_free(chan, desc);

 unlock:

	spin_unlock_irqrestore(&chan->lock, flags);

	return NULL;

}