From patchwork Wed Jul 28 14:40:50 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: 114777 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 o6SEbW1q010912 for ; Wed, 28 Jul 2010 14:37:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755098Ab0G1Og6 (ORCPT ); Wed, 28 Jul 2010 10:36:58 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:57487 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754814Ab0G1Ogc (ORCPT ); Wed, 28 Jul 2010 10:36:32 -0400 Received: from dlep36.itg.ti.com ([157.170.170.91]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id o6SEa7DN014573 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 28 Jul 2010 09:36:07 -0500 Received: from emcc1.sasken-mty.naucm.ext.ti.com (localhost [127.0.0.1]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id o6SEa6MX016758; Wed, 28 Jul 2010 09:36:06 -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 o6SEa2IR013624; Wed, 28 Jul 2010 09:36:05 -0500 (CDT) From: Ernesto Ramos To: gregkh@suse.de Cc: omar.ramirez@ti.com, ohad@wizery.com, ameya.palande@nokia.com, felipe.contreras@nokia.com, fernando.lugo@ti.com, linux-kernel@vger.kernel.org, andy.shevchenko@gmail.com, nm@ti.com, linux-omap@vger.kernel.org, Ernesto Ramos Subject: [PATCH 3/5] staging:ti dspbridge: remove function delete_strm_mgr Date: Wed, 28 Jul 2010 09:40:50 -0500 Message-Id: <1280328052-31292-4-git-send-email-ernesto@ti.com> X-Mailer: git-send-email 1.5.4.5 In-Reply-To: <1280328052-31292-3-git-send-email-ernesto@ti.com> References: <1280328052-31292-1-git-send-email-ernesto@ti.com> <1280328052-31292-2-git-send-email-ernesto@ti.com> <1280328052-31292-3-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]); Wed, 28 Jul 2010 14:37:33 +0000 (UTC) diff --git a/drivers/staging/tidspbridge/rmgr/strm.c b/drivers/staging/tidspbridge/rmgr/strm.c index 73888e3..6c184c6 100644 --- a/drivers/staging/tidspbridge/rmgr/strm.c +++ b/drivers/staging/tidspbridge/rmgr/strm.c @@ -90,7 +90,6 @@ static u32 refs; /* module reference count */ /* ----------------------------------- Function Prototypes */ static int delete_strm(struct strm_object *stream_obj); -static void delete_strm_mgr(struct strm_mgr *strm_mgr_obj); /* * ======== strm_allocate_buffer ======== @@ -232,7 +231,7 @@ int strm_create(struct strm_mgr **strm_man, if (DSP_SUCCEEDED(status)) *strm_man = strm_mgr_obj; else - delete_strm_mgr(strm_mgr_obj); + kfree(strm_mgr_obj); DBC_ENSURE((DSP_SUCCEEDED(status) && *strm_man) || (DSP_FAILED(status) && *strm_man == NULL)); @@ -250,7 +249,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); } /* @@ -859,14 +858,3 @@ static int delete_strm(struct strm_object *stream_obj) } 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); -}