From: Andy Shevchenko Subject: [PATCH] dspbridge: use linux memory allocator directly Date: Wed, 2 Sep 2009 20:27:10 +0300 Message-ID: <1251912430-23182-1-git-send-email-andy.shevchenko@gmail.com> References: <1251805173-15214-3-git-send-email-andy.shevchenko@gmail.com> Return-path: Received: from smtp.nokia.com ([192.100.105.134]:20809 "EHLO mgw-mx09.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753100AbZIBR1Y (ORCPT ); Wed, 2 Sep 2009 13:27:24 -0400 Received: from vaebh105.NOE.Nokia.com (vaebh105.europe.nokia.com [10.160.244.31]) by mgw-mx09.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n82HQPS4017392 for ; Wed, 2 Sep 2009 12:26:51 -0500 In-Reply-To: <1251805173-15214-3-git-send-email-andy.shevchenko@gmail.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: "linux-omap@vger.kernel.org" Cc: Andy Shevchenko From: Andy Shevchenko Instead of MEM_Calloc()/MEM_Free() use kzalloc()/kfree() calls. Thus we get rid of mem.h dependency. Signed-off-by: Andy Shevchenko --- arch/arm/plat-omap/include/dspbridge/list.h | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/arm/plat-omap/include/dspbridge/list.h b/arch/arm/plat-omap/include/dspbridge/list.h index c9d9e49..cda1d21 100644 --- a/arch/arm/plat-omap/include/dspbridge/list.h +++ b/arch/arm/plat-omap/include/dspbridge/list.h @@ -49,8 +49,8 @@ #define LIST_ #include -/* MEM_Calloc(), MEM_NONPAGED, MEM_Free() */ -#include +#include +#include #include #define LST_ELEM list_head @@ -85,9 +85,9 @@ struct LST_LIST { static inline struct LST_LIST *LST_Create(void) { struct LST_LIST *pList; + gfp_t flags = (in_atomic()) ? GFP_ATOMIC : GFP_KERNEL; - pList = (struct LST_LIST *) MEM_Calloc(sizeof(struct LST_LIST), - MEM_NONPAGED); + pList = (struct LST_LIST *) kzalloc(sizeof(struct LST_LIST), flags); if (pList != NULL) INIT_LIST_HEAD(&pList->head); @@ -116,7 +116,8 @@ static inline struct LST_LIST *LST_Create(void) */ static inline void LST_Delete(struct LST_LIST *pList) { - MEM_Free(pList); + if (pList != NULL) + kfree(pList); } /* -- 1.5.6.5