From patchwork Mon Jun 21 22:07:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ramos Falcon, Ernesto" X-Patchwork-Id: 107267 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5LM4kql030457 for ; Mon, 21 Jun 2010 22:04:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755738Ab0FUWE2 (ORCPT ); Mon, 21 Jun 2010 18:04:28 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:47205 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754847Ab0FUWE1 (ORCPT ); Mon, 21 Jun 2010 18:04:27 -0400 Received: from dlep33.itg.ti.com ([157.170.170.112]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id o5LM4OI4032129 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 21 Jun 2010 17:04:24 -0500 Received: from emcc1.sasken-mty.naucm.ext.ti.com (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id o5LM4N9A011163; Mon, 21 Jun 2010 17:04:23 -0500 (CDT) Received: from localhost.localdomain (x0076199-desktop.sasken-mty.naucm.ext.ti.com [10.87.230.107]) by emcc1.sasken-mty.naucm.ext.ti.com (8.13.8+Sun/8.13.8) with ESMTP id o5LM43d6027313; Mon, 21 Jun 2010 17:04:07 -0500 (CDT) From: Ernesto Ramos To: linux-omap@vger.kernel.org Cc: felipe.contreras@nokia.com, ameya.palande@nokia.com, hiroshi.doyu@nokia.com, Ernesto Ramos Subject: [PATCH 3/5] DSPBRIDGE: Remove function delete_strm_mgr Date: Mon, 21 Jun 2010 17:07:12 -0500 Message-Id: <1277158034-21843-3-git-send-email-ernesto@ti.com> X-Mailer: git-send-email 1.5.4.5 In-Reply-To: <1277158034-21843-2-git-send-email-ernesto@ti.com> References: <1277158034-21843-1-git-send-email-ernesto@ti.com> <1277158034-21843-2-git-send-email-ernesto@ti.com> 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]); Mon, 21 Jun 2010 22:04:46 +0000 (UTC) diff --git a/drivers/dsp/bridge/rmgr/strm.c b/drivers/dsp/bridge/rmgr/strm.c index e537ee8..ce32b3d 100644 --- a/drivers/dsp/bridge/rmgr/strm.c +++ b/drivers/dsp/bridge/rmgr/strm.c @@ -89,7 +89,6 @@ static u32 refs; /* module reference count */ /* ----------------------------------- Function Prototypes */ static int delete_strm(struct strm_object *hStrm); -static void delete_strm_mgr(struct strm_mgr *strm_mgr_obj); /* * ======== strm_allocate_buffer ======== @@ -230,7 +229,7 @@ int strm_create(OUT struct strm_mgr **phStrmMgr, if (DSP_SUCCEEDED(status)) *phStrmMgr = strm_mgr_obj; else - delete_strm_mgr(strm_mgr_obj); + kfree(strm_mgr_obj); DBC_ENSURE((DSP_SUCCEEDED(status) && *phStrmMgr) || (DSP_FAILED(status) && *phStrmMgr == NULL)); @@ -248,7 +247,7 @@ void strm_delete(struct strm_mgr *strm_mgr_obj) DBC_REQUIRE(refs > 0); DBC_REQUIRE(strm_mgr_obj); - delete_strm_mgr(strm_mgr_obj); + kfree(strm_mgr_obj); } /* @@ -848,14 +847,3 @@ static int delete_strm(struct strm_object *hStrm) } return status; } - -/* - * ======== delete_strm_mgr ======== - * Purpose: - * Frees stream manager. - */ -static void delete_strm_mgr(struct strm_mgr *strm_mgr_obj) -{ - if (strm_mgr_obj) - kfree(strm_mgr_obj); -}