summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRoger Quadros <rogerq@ti.com>2012-08-15 14:58:35 +0300
committerAndy Green <andy.green@linaro.org>2012-09-07 13:06:58 +0800
commitfea2b5b7e5997401616c88e1713fef106e02eabb (patch)
treebefb396e22081c85469ae66ebd97bc036ce8d26f /drivers
parentefbb582953f0ceb001fabcbed35df7b15791a052 (diff)
rpms: omx: get rid of undefined warnings
This patch fixes the following warnings if CONFIG_DMA_SHARED_BUFFER and CONFIG_OMAP_ION are not enabled. drivers/rpmsg/rpmsg_omx.c: In function '_rpmsg_omx_buffer_get': drivers/rpmsg/rpmsg_omx.c:244: warning: unused variable 'omxserv' drivers/rpmsg/rpmsg_omx.c: In function '_rpmsg_omx_buffer_put': drivers/rpmsg/rpmsg_omx.c:287: warning: unused variable 'omxserv' drivers/rpmsg/rpmsg_omx.c: At top level: drivers/rpmsg/rpmsg_omx.c:143: warning: '_rpmsg_pa_to_da' defined but not used Signed-off-by: Roger Quadros <rogerq@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/rpmsg/rpmsg_omx.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/rpmsg/rpmsg_omx.c b/drivers/rpmsg/rpmsg_omx.c
index c134f7bcbcdf..b5105e4682bd 100644
--- a/drivers/rpmsg/rpmsg_omx.c
+++ b/drivers/rpmsg/rpmsg_omx.c
@@ -140,6 +140,7 @@ static DEFINE_IDR(rpmsg_omx_services);
static DEFINE_SPINLOCK(rpmsg_omx_services_lock);
static LIST_HEAD(rpmsg_omx_services_list);
+#if defined(CONFIG_DMA_SHARED_BUFFER) || defined(CONFIG_ION_OMAP)
static int _rpmsg_pa_to_da(struct rpmsg_omx_instance *omx, u32 pa, u32 *da)
{
int ret;
@@ -162,6 +163,7 @@ static int _rpmsg_pa_to_da(struct rpmsg_omx_instance *omx, u32 pa, u32 *da)
return ret;
}
+#endif
#ifdef CONFIG_DMA_SHARED_BUFFER
/*
@@ -241,11 +243,11 @@ static struct dma_info_t *rpmsg_omx_dma_find(struct rpmsg_omx_instance *omx, int
static int _rpmsg_omx_buffer_get(struct rpmsg_omx_instance *omx,
long buffer, phys_addr_t *da)
{
- struct rpmsg_omx_service *omxserv = omx->omxserv;
int ret = -EIO;
#ifdef CONFIG_DMA_SHARED_BUFFER
{
+ struct rpmsg_omx_service *omxserv = omx->omxserv;
int fd = (int) buffer;
phys_addr_t pa;
@@ -284,11 +286,11 @@ exit:
static int _rpmsg_omx_buffer_put(struct rpmsg_omx_instance *omx,
long buffer, phys_addr_t *da)
{
- struct rpmsg_omx_service *omxserv = omx->omxserv;
int ret = -EIO;
#ifdef CONFIG_DMA_SHARED_BUFFER
{
+ struct rpmsg_omx_service *omxserv = omx->omxserv;
int fd = (int) buffer;
phys_addr_t pa;