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

Commit 594ece4d authored by Rabin Vincent's avatar Rabin Vincent Committed by Dan Williams
Browse files

dma40: remove unnecessary ALIGN()s 



ALIGN(x * y, y) == x * y
ALIGN(aligned + x * y, y) == aligned + x * y

Acked-by: default avatarPer Forlin <per.forlin@stericsson.com>
Acked-by: default avatarJonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: default avatarRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent ac2c0a38

drivers/dma/ste_dma40.c

+3 −5
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static int d40_pool_lli_alloc(struct d40_desc *d40d, 
		d40d->lli_pool.size = sizeof(d40d->lli_pool.pre_alloc_lli);

		d40d->lli_pool.base = NULL;

	} else {

		d40d->lli_pool.size = ALIGN(lli_len * 2 * align, align);

		d40d->lli_pool.size = lli_len * 2 * align;



		base = kmalloc(d40d->lli_pool.size + align, GFP_NOWAIT);

		d40d->lli_pool.base = base;
@@ -356,13 +356,11 @@ static int d40_pool_lli_alloc(struct d40_desc *d40d, 
	if (is_log) {

		d40d->lli_log.src = PTR_ALIGN((struct d40_log_lli *) base,

					      align);

		d40d->lli_log.dst = PTR_ALIGN(d40d->lli_log.src + lli_len,

					      align);

		d40d->lli_log.dst = d40d->lli_log.src + lli_len;

	} else {

		d40d->lli_phy.src = PTR_ALIGN((struct d40_phy_lli *)base,

					      align);

		d40d->lli_phy.dst = PTR_ALIGN(d40d->lli_phy.src + lli_len,

					      align);

		d40d->lli_phy.dst = d40d->lli_phy.src + lli_len;

	}



	return 0;