[git pull] drivers/dma: fixups for 2.6.26-rc

[Dan Williams]

Linus, please pull from:

	master.kernel.org:/pub/scm/linux/kernel/git/djbw/async_tx.git fixes

to receive:

Christophe Jaillet (1):
      iop-adma: fixup some kzalloc/memset confusions

Zhang Wei (1):
      fsldma: update the fsldma driver MAINTAINERS info

 MAINTAINERS            |    6 ++++--
 drivers/dma/iop-adma.c |    6 ++----
 2 files changed, 6 insertions(+), 6 deletions(-)


Just a maintainer update and some simple cleanups of the iop-adma
driver.

Thanks,
Dan

Full log:
commit eccf2144e1232c33a8235033ffa079b6ebf92faf
Author: Christophe Jaillet <christophe.jaillet@xxxxxxxxxx>
Date:   Tue May 20 16:33:06 2008 -0700

    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@xxxxxxxxxx>
    Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>

diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
index 762b729..0ec0f43 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,

commit 76b0c788e6033c514f2a75171b04c73c68d28e8d
Author: Zhang Wei <zw@xxxxxxxxxxxxx>
Date:   Tue May 13 14:44:59 2008 -0700

    fsldma: update the fsldma driver MAINTAINERS info
    
    Add Li Yang as the new maintainer for fsldma driver and update
    my email address.
    
    Acked-by: Li Yang <leoli@xxxxxxxxxxxxx>
    Signed-off-by: Zhang Wei <zw@xxxxxxxxxxxxx>
    Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>

diff --git a/MAINTAINERS b/MAINTAINERS
index dc94fc5..7fd9c43 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1646,8 +1646,10 @@ W:	http://linux-fbdev.sourceforge.net/
 S:	Maintained
 
 FREESCALE DMA DRIVER
-P;	Zhang Wei
-M:	wei.zhang@xxxxxxxxxxxxx
+P:	Li Yang
+M:	leoli@xxxxxxxxxxxxx
+P:	Zhang Wei
+M:	zw@xxxxxxxxxxxxx
 L:	linuxppc-embedded@xxxxxxxxxx
 L:	linux-kernel@xxxxxxxxxxxxxxx
 S:	Maintained


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/