From 1300c259f36c9f55842258df5fbab1d94be639ab Mon Sep 17 00:00:00 2001 From: Vinod Koul Date: Thu, 29 Nov 2012 12:17:22 +0530 Subject: [PATCH] --- yaml --- r: 358484 b: refs/heads/master c: 91f8aecc501e456c97a6f49f7ea3797e874d5d89 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/of_dma.h | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5faad8a68731..3e2d1809807f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9743a3b62dee8c9d8af1319f8d1c1ff39130267d +refs/heads/master: 91f8aecc501e456c97a6f49f7ea3797e874d5d89 diff --git a/trunk/include/linux/of_dma.h b/trunk/include/linux/of_dma.h index 84b64f857e23..d15073e080dd 100644 --- a/trunk/include/linux/of_dma.h +++ b/trunk/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;