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

Commit eccf2144 authored by Christophe Jaillet's avatar Christophe Jaillet Committed by Dan Williams
Browse files

iop-adma: fixup some kzalloc/memset confusions 



1) Remove an explicit memset(.., 0, ...) to a variable allocated with
kzalloc (i.e. 'dest').

2) Allocate 'src' with kmalloc instead of kzalloc as all elements of the
'src' buffer are initialized in a 'for(...)' loop just after.

3) remove useless 'sizeof(u8)', which always returns 1, when computing the
size of the memory to be allocated.

Signed-off-by: default avatarChristophe Jaillet <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 76b0c788

drivers/dma/iop-adma.c

+2 −4
Original line number Diff line number Diff line
@@ -821,10 +821,10 @@ static int __devinit iop_adma_memcpy_self_test(struct iop_adma_device *device) 


	dev_dbg(device->common.dev, "%s\n", __func__);



	src = kzalloc(sizeof(u8) * IOP_ADMA_TEST_SIZE, GFP_KERNEL);

	src = kmalloc(IOP_ADMA_TEST_SIZE, GFP_KERNEL);

	if (!src)

		return -ENOMEM;

	dest = kzalloc(sizeof(u8) * IOP_ADMA_TEST_SIZE, GFP_KERNEL);

	dest = kzalloc(IOP_ADMA_TEST_SIZE, GFP_KERNEL);

	if (!dest) {

		kfree(src);

		return -ENOMEM;
@@ -834,8 +834,6 @@ static int __devinit iop_adma_memcpy_self_test(struct iop_adma_device *device) 
	for (i = 0; i < IOP_ADMA_TEST_SIZE; i++)

		((u8 *) src)[i] = (u8)i;



	memset(dest, 0, IOP_ADMA_TEST_SIZE);



	/* Start copy, using first DMA channel */

	dma_chan = container_of(device->common.channels.next,

				struct dma_chan,