From 75321a45556dc4106be0affc1054ef523625a9ef Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 21 Oct 2005 22:26:07 +0100
Subject: [PATCH] --- yaml --- r: 11287 b: refs/heads/master c:
 030274ae03c20f9ac27d4218118b9679d7c680d8 h: refs/heads/master i:   11285:
 5c350794d72cdaf22b426e9a00630ec47bd6053f   11283:
 22fa8dfa1bcc44a896c11285c81c4ece975a530a   11279:
 729bfb38d8218f343ef927b80628b9ed925c9c4a v: v3

---
 [refs]                                | 2 +-
 trunk/arch/mips/au1000/common/dbdma.c | 3 +--
 trunk/arch/mips/kernel/irixelf.c      | 4 +---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 7283ffee4e44..06c6621dc5cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5adb8770e12169a6595a3ad5682541441bd1052
+refs/heads/master: 030274ae03c20f9ac27d4218118b9679d7c680d8
diff --git a/trunk/arch/mips/au1000/common/dbdma.c b/trunk/arch/mips/au1000/common/dbdma.c
index a5a6709637e0..d00e8247d6c2 100644
--- a/trunk/arch/mips/au1000/common/dbdma.c
+++ b/trunk/arch/mips/au1000/common/dbdma.c
@@ -290,8 +290,7 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
 				/* If kmalloc fails, it is caught below same
 				 * as a channel not available.
 				 */
-				ctp = (chan_tab_t *)
-					kmalloc(sizeof(chan_tab_t), GFP_KERNEL);
+				ctp = kmalloc(sizeof(chan_tab_t), GFP_KERNEL);
 				chan_tab_ptr[i] = ctp;
 				break;
 			}
diff --git a/trunk/arch/mips/kernel/irixelf.c b/trunk/arch/mips/kernel/irixelf.c
index 5aeacc1ffb24..99262fe64560 100644
--- a/trunk/arch/mips/kernel/irixelf.c
+++ b/trunk/arch/mips/kernel/irixelf.c
@@ -422,9 +422,7 @@ static inline int look_for_irix_interpreter(char **name,
 		if (*name != NULL)
 			goto out;
 
-		*name = (char *) kmalloc((epp->p_filesz +
-					  strlen(IRIX_EMUL)),
-					 GFP_KERNEL);
+		*name = kmalloc(epp->p_filesz + strlen(IRIX_EMUL), GFP_KERNEL);
 		if (!*name)
 			return -ENOMEM;