aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@linux.intel.com>2012-11-29 01:47:22 -0500
committerVinod Koul <vinod.koul@intel.com>2013-01-08 01:05:02 -0500
commit91f8aecc501e456c97a6f49f7ea3797e874d5d89 (patch)
treea69179d63b746419d2dea4bccc82f49ccdd28a0e
parent9743a3b62dee8c9d8af1319f8d1c1ff39130267d (diff)
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 84b64f857e23..d15073e080dd 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,
44extern struct dma_chan *of_dma_simple_xlate(struct of_phandle_args *dma_spec, 44extern struct dma_chan *of_dma_simple_xlate(struct of_phandle_args *dma_spec,
45 struct of_dma *ofdma); 45 struct of_dma *ofdma);
46#else 46#else
47static int of_dma_controller_register(struct device_node *np, 47static inline int of_dma_controller_register(struct device_node *np,
48 struct dma_chan *(*of_dma_xlate) 48 struct dma_chan *(*of_dma_xlate)
49 (struct of_phandle_args *, struct of_dma *), 49 (struct of_phandle_args *, struct of_dma *),
50 void *data) 50 void *data)
@@ -52,17 +52,18 @@ static int of_dma_controller_register(struct device_node *np,
52 return -ENODEV; 52 return -ENODEV;
53} 53}
54 54
55static int of_dma_controller_free(struct device_node *np) 55static inline int of_dma_controller_free(struct device_node *np)
56{ 56{
57 return -ENODEV;
57} 58}
58 59
59static struct dma_chan *of_dma_request_slave_channel(struct device_node *np, 60static inline struct dma_chan *of_dma_request_slave_channel(struct device_node *np,
60 char *name) 61 char *name)
61{ 62{
62 return NULL; 63 return NULL;
63} 64}
64 65
65static struct dma_chan *of_dma_simple_xlate(struct of_phandle_args *dma_spec, 66static inline struct dma_chan *of_dma_simple_xlate(struct of_phandle_args *dma_spec,
66 struct of_dma *ofdma) 67 struct of_dma *ofdma)
67{ 68{
68 return NULL; 69 return NULL;