From f93ea5e7aefba0751780187c8c595f8db6c199a7 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Sun, 7 Nov 2010 07:37:03 +0100 Subject: [PATCH] --- yaml --- r: 228063 b: refs/heads/master c: 3c9d46526db88218a311a72971efae1b4366d4c6 h: refs/heads/master i: 228061: 413ac6007b61dc3f37338726a41b6b4b2f1dd2e8 228059: 5ce0740d23b5eb646d1ad6a3ccd3c6d8de4257b9 228055: 35533fc3405d55fa56244a3059b6eeb7b363c67a 228047: bbd216eccf8ed8c0bfd71cb6aaac5478f1a9d9ae 228031: 316c5ec173c1e88234a6c4b91ee94493bfcfdab6 v: v3 --- [refs] | 2 +- .../astoria/arch/arm/mach-omap2/cyashalomap_kernel.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index cd69901fa22e..411660e87c63 100644 --- 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 index a6780296888f..ad0c61db9937 100644 --- 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); } /*