---

yaml --- r: 228063 b: refs/heads/master c: 3c9d465 h: refs/heads/master i: 228061: 413ac60 228059: 5ce0740 228055: 35533fc 228047: bbd216e 228031: 316c5ec v: v3
git-mirror · Nov 10, 2010 · f93ea5e · f93ea5e
1 parent b911414
commit f93ea5e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f710907ff452ab67bd1161bc3f7a95f9a7e809d
+refs/heads/master: 3c9d46526db88218a311a72971efae1b4366d4c6
diff --git a/trunk/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c b/trunk/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c
@@ -2127,10 +2127,7 @@ void cy_as_hal_pll_lock_loss_handler(cy_as_hal_device_tag tag)
  */
 void *cy_as_hal_alloc(uint32_t cnt)
 {
-	void *ret_p;
-
-	ret_p = kmalloc(cnt, GFP_ATOMIC);
-	return ret_p;
+	return kmalloc(cnt, GFP_ATOMIC);
 }
 
 /*
@@ -2150,10 +2147,7 @@ void cy_as_hal_free(void *mem_p)
  */
 void *cy_as_hal_c_b_alloc(uint32_t cnt)
 {
-	void *ret_p;
-
-	ret_p = kmalloc(cnt, GFP_ATOMIC);
-	return ret_p;
+	return kmalloc(cnt, GFP_ATOMIC);
 }
 
 /*