From: Felipe Contreras <felipe.contreras@gmail.com>
To: linux-omap <linux-omap@vger.kernel.org>
Cc: Omar Ramirez Luna <omar.ramirez@ti.com>,
Ameya Palande <ameya.palande@nokia.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH 1/2] dsp-bridge: improve PM conditional code
Date: Fri, 18 Dec 2009 19:44:36 +0200 [thread overview]
Message-ID: <1261158277-26402-2-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1261016163-11091-19-git-send-email-omar.ramirez@ti.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
arch/arm/mach-omap2/dspbridge.c | 2 ++
drivers/dsp/bridge/rmgr/drv_interface.c | 5 ++++-
drivers/dsp/bridge/wmd/tiomap3430_pwr.c | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/dspbridge.c b/arch/arm/mach-omap2/dspbridge.c
index 9724a95..ea109a3 100644
--- a/arch/arm/mach-omap2/dspbridge.c
+++ b/arch/arm/mach-omap2/dspbridge.c
@@ -13,7 +13,9 @@
#include <linux/platform_device.h>
+#ifdef CONFIG_BRIDGE_DVFS
#include <mach/omap-pm.h>
+#endif
#include <dspbridge/host_os.h>
diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c
index 6415955..90d4bad 100644
--- a/drivers/dsp/bridge/rmgr/drv_interface.c
+++ b/drivers/dsp/bridge/rmgr/drv_interface.c
@@ -96,8 +96,10 @@
#include <dspbridge/drv.h>
#endif
+#ifdef CONFIG_BRIDGE_DVFS
#include <mach/omap-pm.h>
#include <mach-omap2/omap3-opp.h>
+#endif
#define BRIDGE_NAME "C6410"
/* ----------------------------------- Globals */
@@ -147,7 +149,6 @@ static int omap34xxbridge_suspend_lockout(
}
return 0;
}
-
#endif
#ifdef DEBUG
@@ -459,8 +460,10 @@ static int __devexit omap34xx_bridge_remove(struct platform_device *pdev)
DBC_Assert(ret == true);
}
+#ifdef CONFIG_BRIDGE_DVFS
clk_put(clk_handle);
clk_handle = NULL;
+#endif /* #ifdef CONFIG_BRIDGE_DVFS */
func_cont:
MEM_ExtPhysPoolRelease();
diff --git a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c
index ea299a0..8a0cb02 100644
--- a/drivers/dsp/bridge/wmd/tiomap3430_pwr.c
+++ b/drivers/dsp/bridge/wmd/tiomap3430_pwr.c
@@ -68,8 +68,8 @@
#ifdef CONFIG_PM
#include <mach/board-3430sdp.h>
-#endif
extern s32 dsp_test_sleepstate;
+#endif
extern struct MAILBOX_CONTEXT mboxsetting;
/*
--
1.6.6.rc2.5.g49666
next prev parent reply other threads:[~2009-12-18 17:45 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-17 2:15 [PATCHv2 00/18] First set of unreviewed patches Omar Ramirez Luna
2009-12-17 2:15 ` [PATCHv2 01/18] DSPBRIDGE: Fix compile break for WCD debug mask Omar Ramirez Luna
2009-12-17 2:15 ` [PATCHv2 02/18] DSPBRIDGE: enable smart/autoidle for mailbox sysconfig Omar Ramirez Luna
2009-12-17 2:15 ` [PATCHv2 03/18] DSPBRIDGE: Remove preproessor condition that could never work Omar Ramirez Luna
2009-12-17 2:15 ` [PATCHv2 04/18] DSPBRIDGE: Implemented Trampoline support for dynamic loader Omar Ramirez Luna
2009-12-17 2:15 ` [PATCHv2 05/18] DSPBRIDGE: Enable/Disable MCBSP_CLOCKS for MCBSP2 Omar Ramirez Luna
2009-12-17 2:15 ` [PATCHv2 06/18] DSPBRIDGE: set PWRERROR notifications as an option Omar Ramirez Luna
2009-12-17 2:15 ` [PATCHv2 07/18] DSPBRIDGE: Enable peripheral clocks on wake up Omar Ramirez Luna
2009-12-17 2:15 ` [PATCHv2 08/18] DSPBRIDGE: Remove long busy-wait loops on PWRST transitions Omar Ramirez Luna
2009-12-17 2:15 ` [PATCHv2 09/18] DSPBRIDGE: Rename usCount to timeout Omar Ramirez Luna
2009-12-17 2:15 ` [PATCHv2 10/18] DSPBRIDGE: Trivial cleanup on DBDCD Omar Ramirez Luna
2009-12-17 2:15 ` [PATCHv2 11/18] DSPBRIDGE: Do not panic on bad page count Omar Ramirez Luna
2009-12-17 2:15 ` [PATCHv2 12/18] DSPBRIDGE: support loading 4 dependent DLL Omar Ramirez Luna
2009-12-17 2:15 ` [PATCHv2 13/18] DSPBRIDGE: Memory leak in Node Register Notify Omar Ramirez Luna
2009-12-17 2:15 ` [PATCHv2 14/18] DSPBRIDGE: check pointer before calling Proc_Detach Omar Ramirez Luna
2009-12-17 2:16 ` [PATCHv2 15/18] DSPBRIDGE: check the status of DMM_GetHandle Omar Ramirez Luna
2009-12-17 2:16 ` [PATCHv2 16/18] DSPBRIDGE: KFILE_Seek & KFILE_Tell, u32 replaced with loff_t Omar Ramirez Luna
2009-12-17 2:16 ` [PATCHv2 17/18] DSPBRIDGE: Delete unused files Omar Ramirez Luna
2009-12-17 2:16 ` [PATCHv2 18/18] DSPBRIDGE: Compilation fixes 2.6.31 Omar Ramirez Luna
2009-12-18 17:44 ` [PATCH 0/2] dsp-bridge: PM cleanups Felipe Contreras
2009-12-18 17:44 ` Felipe Contreras [this message]
2009-12-18 17:44 ` [PATCH 2/2] dsp-bridge: remove unused includes Felipe Contreras
2009-12-18 17:48 ` [PATCHv2 18/18] DSPBRIDGE: Compilation fixes 2.6.31 Felipe Contreras
2009-12-18 21:50 ` Ramirez Luna, Omar
2009-12-22 13:13 ` [PATCHv2 00/18] First set of unreviewed patches Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1261158277-26402-2-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=ameya.palande@nokia.com \
--cc=linux-omap@vger.kernel.org \
--cc=omar.ramirez@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.