diff options
| author | Christophe Jaillet <christophe.jaillet@wanadoo.fr> | 2008-05-20 16:33:06 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2008-05-20 13:51:20 -0700 |
| commit | eccf2144e1232c33a8235033ffa079b6ebf92faf (patch) | |
| tree | 870dece32d3a26405f335884ffee0276d23f4a65 /drivers/dma/iop-adma.c | |
| parent | 76b0c788e6033c514f2a75171b04c73c68d28e8d (diff) | |
| download | linux-stable-eccf2144e1232c33a8235033ffa079b6ebf92faf.tar.gz linux-stable-eccf2144e1232c33a8235033ffa079b6ebf92faf.tar.bz2 linux-stable-eccf2144e1232c33a8235033ffa079b6ebf92faf.zip | |
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: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma/iop-adma.c')
| -rw-r--r-- | drivers/dma/iop-adma.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c index 762b729672e0..0ec0f431e6a1 100644 --- a/drivers/dma/iop-adma.c +++ b/drivers/dma/iop-adma.c @@ -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, |