From patchwork Wed Aug 25 22:09:04 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: 133201 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 o7PMIVmM031172 for ; Wed, 25 Aug 2010 22:18:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754770Ab0HYWR3 (ORCPT ); Wed, 25 Aug 2010 18:17:29 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:59107 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752960Ab0HYWRZ (ORCPT ); Wed, 25 Aug 2010 18:17:25 -0400 Received: from dlep34.itg.ti.com ([157.170.170.115]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id o7PMHKme005506 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 25 Aug 2010 17:17:20 -0500 Received: from emcc1.sasken-mty.naucm.ext.ti.com (localhost [127.0.0.1]) by dlep34.itg.ti.com (8.13.7/8.13.7) with ESMTP id o7PMHJD7027507; Wed, 25 Aug 2010 17:17:19 -0500 (CDT) Received: from localhost.localdomain (x0128362-desktop.sasken-mty.naucm.ext.ti.com [10.87.231.130]) by emcc1.sasken-mty.naucm.ext.ti.com (8.13.8+Sun/8.13.8) with ESMTP id o7PMFxmI011346; Wed, 25 Aug 2010 17:17:19 -0500 (CDT) From: Ivan Gomez Castellanos To: linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, gregkh@suse.de Cc: Hiroshi.DOYU@nokia.com, ameya.palande@nokia.com, felipe.contreras@nokia.com, omar.ramirez@ti.com, ohad@wizery.com, rene.sapiens@ti.com, nm@ti.com, ernesto@ti.com, x0095078@ti.com, Ivan Gomez Castellanos Subject: [PATCH 11/11] staging: tidspbridge: Remove services.c and services.h Date: Wed, 25 Aug 2010 17:09:04 -0500 Message-Id: <1282774144-11628-12-git-send-email-ivan.gomez@ti.com> X-Mailer: git-send-email 1.7.0.3 In-Reply-To: <1282774144-11628-1-git-send-email-ivan.gomez@ti.com> References: <1282774144-11628-1-git-send-email-ivan.gomez@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, 25 Aug 2010 22:18:33 +0000 (UTC) diff --git a/drivers/staging/tidspbridge/Makefile b/drivers/staging/tidspbridge/Makefile index 8f0ca88..8082d5c 100644 --- a/drivers/staging/tidspbridge/Makefile +++ b/drivers/staging/tidspbridge/Makefile @@ -1,7 +1,6 @@ obj-$(CONFIG_TIDSPBRIDGE) += bridgedriver.o libgen = gen/gb.o gen/gs.o gen/gh.o gen/uuidutil.o -libservices = services/services.o libcore = core/chnl_sm.o core/msg_sm.o core/io_sm.o core/tiomap3430.o \ core/tiomap3430_pwr.o core/tiomap_io.o \ core/ue_deh.o core/wdt.o core/dsp-clock.o core/sync.o diff --git a/drivers/staging/tidspbridge/include/dspbridge/services.h b/drivers/staging/tidspbridge/include/dspbridge/services.h deleted file mode 100644 index eb26c86..0000000 --- a/drivers/staging/tidspbridge/include/dspbridge/services.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * services.h - * - * DSP-BIOS Bridge driver support functions for TI OMAP processors. - * - * Provide loading and unloading of SERVICES modules. - * - * Copyright (C) 2005-2006 Texas Instruments, Inc. - * - * This package is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - */ - -#ifndef SERVICES_ -#define SERVICES_ - -#include -/* - * ======== services_exit ======== - * Purpose: - * Discontinue usage of module; free resources when reference count - * reaches 0. - * Parameters: - * Returns: - * Requires: - * SERVICES initialized. - * Ensures: - * Resources used by module are freed when cRef reaches zero. - */ -extern void services_exit(void); - -/* - * ======== services_init ======== - * Purpose: - * Initializes SERVICES modules. - * Parameters: - * Returns: - * TRUE if all modules initialized; otherwise FALSE. - * Requires: - * Ensures: - * SERVICES modules initialized. - */ -extern bool services_init(void); - -#endif /* SERVICES_ */ diff --git a/drivers/staging/tidspbridge/pmgr/dspapi.c b/drivers/staging/tidspbridge/pmgr/dspapi.c index 10a1444..b23591b 100644 --- a/drivers/staging/tidspbridge/pmgr/dspapi.c +++ b/drivers/staging/tidspbridge/pmgr/dspapi.c @@ -29,7 +29,6 @@ /* ----------------------------------- OS Adaptation Layer */ #include -#include /* ----------------------------------- Platform Manager */ #include diff --git a/drivers/staging/tidspbridge/rmgr/drv_interface.c b/drivers/staging/tidspbridge/rmgr/drv_interface.c index ae28b96..4c0b9ee 100644 --- a/drivers/staging/tidspbridge/rmgr/drv_interface.c +++ b/drivers/staging/tidspbridge/rmgr/drv_interface.c @@ -39,7 +39,6 @@ #include /* ----------------------------------- OS Adaptation Layer */ -#include #include #include @@ -270,7 +269,6 @@ static int omap3_bridge_startup(struct platform_device *pdev) #endif dsp_clk_init(); - services_init(); drv_datap = kzalloc(sizeof(struct drv_data), GFP_KERNEL); if (!drv_datap) { @@ -327,7 +325,6 @@ err1: CPUFREQ_TRANSITION_NOTIFIER); #endif dsp_clk_exit(); - services_exit(); return err; } @@ -420,7 +417,6 @@ func_cont: mem_ext_phys_pool_release(); dsp_clk_exit(); - services_exit(); devno = MKDEV(driver_major, 0); cdev_del(&bridge_cdev); diff --git a/drivers/staging/tidspbridge/services/services.c b/drivers/staging/tidspbridge/services/services.c deleted file mode 100644 index 3d0497e..0000000 --- a/drivers/staging/tidspbridge/services/services.c +++ /dev/null @@ -1,57 +0,0 @@ -/* - * services.c - * - * DSP-BIOS Bridge driver support functions for TI OMAP processors. - * - * Provide SERVICES loading. - * - * Copyright (C) 2005-2006 Texas Instruments, Inc. - * - * This package is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - */ - -#include - -#include - -/* ----------------------------------- DSP/BIOS Bridge */ -#include - -/* ----------------------------------- Trace & Debug */ -#include - -/* ----------------------------------- OS Adaptation Layer */ -#include -#include -#include - -/* ----------------------------------- This */ -#include - -/* - * ======== services_exit ======== - * Purpose: - * Discontinue usage of module; free resources when reference count - * reaches 0. - */ -void services_exit(void) -{ -} - -/* - * ======== services_init ======== - * Purpose: - * Initializes SERVICES modules. - */ -bool services_init(void) -{ - bool ret = true; - - return ret; -}