From patchwork Fri Apr 9 00:01:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gomez Castellanos, Ivan" X-Patchwork-Id: 91566 X-Patchwork-Delegate: omar.ramirez@ti.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3903xJm023172 for ; Fri, 9 Apr 2010 00:04:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933796Ab0DIAD7 (ORCPT ); Thu, 8 Apr 2010 20:03:59 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:59722 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758215Ab0DIAD6 convert rfc822-to-8bit (ORCPT ); Thu, 8 Apr 2010 20:03:58 -0400 Received: from dlep33.itg.ti.com ([157.170.170.112]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o3903ssg003626 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 8 Apr 2010 19:03:54 -0500 Received: from dlep26.itg.ti.com (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id o3903sD3005190; Thu, 8 Apr 2010 19:03:54 -0500 (CDT) Received: from dsbe71.ent.ti.com (localhost [127.0.0.1]) by dlep26.itg.ti.com (8.13.8/8.13.8) with ESMTP id o3903sa1021232; Thu, 8 Apr 2010 19:03:54 -0500 (CDT) Received: from dlee01.ent.ti.com ([157.170.170.12]) by dsbe71.ent.ti.com ([156.117.232.23]) with mapi; Thu, 8 Apr 2010 19:03:53 -0500 From: "Gomez Castellanos, Ivan" To: "linux-omap@vger.kernel.org" CC: "Ameya.Palande@nokia.com" , "Hiroshi.DOYU@nokia.com" , "felipe.contreras@nokia.com" , "Menon, Nishanth" Date: Thu, 8 Apr 2010 19:01:28 -0500 Subject: [PATCH 05/13] DSPBRIDGE: Remove mem_init and mem_exit functions Thread-Topic: [PATCH 05/13] DSPBRIDGE: Remove mem_init and mem_exit functions Thread-Index: AQHK13gjd1mqxS6DXk+Hfvk5RJb61Q== Message-ID: <818EF96F5A7CC84789DD014773DB09548E64D150@dlee01.ent.ti.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 09 Apr 2010 00:04:00 +0000 (UTC) diff --git a/arch/arm/plat-omap/include/dspbridge/mem.h b/arch/arm/plat-omap/include/dspbridge/mem.h index 9f713b9..f321f3f 100644 --- a/arch/arm/plat-omap/include/dspbridge/mem.h +++ b/arch/arm/plat-omap/include/dspbridge/mem.h @@ -90,20 +90,6 @@ extern void *mem_alloc(IN u32 byte_size, IN enum mem_poolattrs type); extern void *mem_calloc(IN u32 byte_size, IN enum mem_poolattrs type); /* - * ======== mem_exit ======== - * Purpose: - * Discontinue usage of module; free resources when reference count - * reaches 0. - * Parameters: - * Returns: - * Requires: - * MEM is initialized. - * Ensures: - * Resources used by module are freed when cRef reaches zero. - */ -extern void mem_exit(void); - -/* * ======== MEM_FREE_OBJECT ======== * Purpose: * Utility macro to invalidate an object's signature, and deallocate it. @@ -138,19 +124,6 @@ extern void mem_exit(void); extern s32 mem_get_num_pages(IN void *paddr, IN u32 byte_size); /* - * ======== services_mem_init ======== - * Purpose: - * Initializes private state of MEM module. - * Parameters: - * Returns: - * TRUE if initialized; FALSE if error occured. - * Requires: - * Ensures: - * MEM initialized. - */ -extern bool services_mem_init(void); - -/* * ======== MEM_IS_VALID_HANDLE ======== * Purpose: * Validate the object handle. diff --git a/drivers/dsp/bridge/services/mem.c b/drivers/dsp/bridge/services/mem.c index 6e8834a..cf33e89 100644 --- a/drivers/dsp/bridge/services/mem.c +++ b/drivers/dsp/bridge/services/mem.c @@ -96,24 +96,3 @@ void *mem_calloc(u32 byte_size, enum mem_poolattrs type) return mem; } - -/* - * ======== mem_exit ======== - * Purpose: - * Discontinue usage of the MEM module. - */ -void mem_exit(void) -{ -} - - - -/* - * ======== services_mem_init ======== - * Purpose: - * Initialize MEM module private state. - */ -bool services_mem_init(void) -{ - return true; -} diff --git a/drivers/dsp/bridge/services/services.c b/drivers/dsp/bridge/services/services.c index df3de5f..49a0a89 100644 --- a/drivers/dsp/bridge/services/services.c +++ b/drivers/dsp/bridge/services/services.c @@ -48,7 +48,6 @@ void services_exit(void) clk_exit(); reg_exit(); cfg_exit(); - mem_exit(); } /* @@ -59,16 +58,15 @@ void services_exit(void) bool services_init(void) { bool ret = true; - bool fcfg, fmem; + bool fcfg; bool freg, fclk; /* Perform required initialization of SERVICES modules. */ - fmem = services_mem_init(); freg = reg_init(); fcfg = cfg_init(); fclk = services_clk_init(); - ret = fcfg && fmem && freg && fclk; + ret = fcfg && freg && fclk; if (!ret) { @@ -80,10 +78,6 @@ bool services_init(void) if (fcfg) cfg_exit(); - - if (fmem) - mem_exit(); - } return ret;