summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@linux.intel.com>2012-11-29 12:17:22 +0530
committerVinod Koul <vinod.koul@intel.com>2013-01-07 22:05:02 -0800
commit91f8aecc501e456c97a6f49f7ea3797e874d5d89 (patch)
treea69179d63b746419d2dea4bccc82f49ccdd28a0e
parent9743a3b62dee8c9d8af1319f8d1c1ff39130267d (diff)
downloadop-kernel-dev-91f8aecc501e456c97a6f49f7ea3797e874d5d89.zip
op-kernel-dev-91f8aecc501e456c97a6f49f7ea3797e874d5d89.tar.gz
dmaengine: fix !of_dma compilation warning
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
-rw-r--r--include/linux/of_dma.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/of_dma.h b/include/linux/of_dma.h
index 84b64f8..d15073e 100644
--- a/include/linux/of_dma.h
+++ b/include/linux/of_dma.h
@@ -44,7 +44,7 @@ extern struct dma_chan *of_dma_request_slave_channel(struct device_node *np,
extern struct dma_chan *of_dma_simple_xlate(struct of_phandle_args *dma_spec,
struct of_dma *ofdma);
#else
-static int of_dma_controller_register(struct device_node *np,
+static inline int of_dma_controller_register(struct device_node *np,
struct dma_chan *(*of_dma_xlate)
(struct of_phandle_args *, struct of_dma *),
void *data)
@@ -52,17 +52,18 @@ static int of_dma_controller_register(struct device_node *np,
return -ENODEV;
}
-static int of_dma_controller_free(struct device_node *np)
+static inline int of_dma_controller_free(struct device_node *np)
{
+ return -ENODEV;
}
-static struct dma_chan *of_dma_request_slave_channel(struct device_node *np,
+static inline struct dma_chan *of_dma_request_slave_channel(struct device_node *np,
char *name)
{
return NULL;
}
-static struct dma_chan *of_dma_simple_xlate(struct of_phandle_args *dma_spec,
+static inline struct dma_chan *of_dma_simple_xlate(struct of_phandle_args *dma_spec,
struct of_dma *ofdma)
{
return NULL;
OpenPOWER on IntegriCloud