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

Commit a8be8627 authored by Per Friden's avatar Per Friden Committed by Dan Williams
Browse files

DMAENGINE: ste_dma40: moved freeing of client owned desc 



fixed typo and moved freeing of client owned desc to free_dma.

Signed-off-by: default avatarJonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent ef1872ec

drivers/dma/ste_dma40.c

+12 −12
Original line number Original line Diff line number Diff line
@@ -374,7 +374,6 @@ static void d40_desc_remove(struct d40_desc *d40d) 




static struct d40_desc *d40_desc_get(struct d40_chan *d40c)

static struct d40_desc *d40_desc_get(struct d40_chan *d40c)

{

{

	struct d40_desc *desc;

	struct d40_desc *d;

	struct d40_desc *d;

	struct d40_desc *_d;

	struct d40_desc *_d;
@@ -583,8 +582,6 @@ done: 
static void d40_term_all(struct d40_chan *d40c)

static void d40_term_all(struct d40_chan *d40c)

{

{

	struct d40_desc *d40d;

	struct d40_desc *d40d;

	struct d40_desc *d;

	struct d40_desc *_d;





	/* Release active descriptors */

	/* Release active descriptors */

	while ((d40d = d40_first_active_get(d40c))) {

	while ((d40d = d40_first_active_get(d40c))) {
@@ -602,15 +599,6 @@ static void d40_term_all(struct d40_chan *d40c) 
		d40_desc_free(d40c, d40d);

		d40_desc_free(d40c, d40d);

	}

	}





	/* Release client owned descriptors */

	if (!list_empty(&d40c->client))

		list_for_each_entry_safe(d, _d, &d40c->client, node) {

			d40_pool_lli_free(d);

			d40_desc_remove(d);

			/* Return desc to free-list */

			d40_desc_free(d40c, d40d);

		}



	d40_lcla_id_put(d40c, &d40c->base->lcla_pool,

	d40_lcla_id_put(d40c, &d40c->base->lcla_pool,

			d40c->lcla.src_id);

			d40c->lcla.src_id);

	d40_lcla_id_put(d40c, &d40c->base->lcla_pool,

	d40_lcla_id_put(d40c, &d40c->base->lcla_pool,
@@ -1240,10 +1228,22 @@ static int d40_free_dma(struct d40_chan *d40c) 
	u32 event, dir;

	u32 event, dir;

	struct d40_phy_res *phy = d40c->phy_chan;

	struct d40_phy_res *phy = d40c->phy_chan;

	bool is_src;

	bool is_src;

	struct d40_desc *d;

	struct d40_desc *_d;







	/* Terminate all queued and active transfers */

	/* Terminate all queued and active transfers */

	d40_term_all(d40c);

	d40_term_all(d40c);





	/* Release client owned descriptors */

	if (!list_empty(&d40c->client))

		list_for_each_entry_safe(d, _d, &d40c->client, node) {

			d40_pool_lli_free(d);

			d40_desc_remove(d);

			/* Return desc to free-list */

			d40_desc_free(d40c, d);

		}



	if (phy == NULL) {

	if (phy == NULL) {

		dev_err(&d40c->chan.dev->device, "[%s] phy == null\n",

		dev_err(&d40c->chan.dev->device, "[%s] phy == null\n",

			__func__);

			__func__);