diff options
Diffstat (limited to 'include/linux/of_dma.h')
| -rw-r--r-- | include/linux/of_dma.h | 10 | 
1 files changed, 4 insertions, 6 deletions
diff --git a/include/linux/of_dma.h b/include/linux/of_dma.h index d15073e080d..364dda73487 100644 --- a/include/linux/of_dma.h +++ b/include/linux/of_dma.h @@ -25,7 +25,6 @@ struct of_dma {  	struct dma_chan		*(*of_dma_xlate)  				(struct of_phandle_args *, struct of_dma *);  	void			*of_dma_data; -	int			use_count;  };  struct of_dma_filter_info { @@ -38,9 +37,9 @@ extern int of_dma_controller_register(struct device_node *np,  		struct dma_chan *(*of_dma_xlate)  		(struct of_phandle_args *, struct of_dma *),  		void *data); -extern int of_dma_controller_free(struct device_node *np); +extern void of_dma_controller_free(struct device_node *np);  extern struct dma_chan *of_dma_request_slave_channel(struct device_node *np, -						     char *name); +						     const char *name);  extern struct dma_chan *of_dma_simple_xlate(struct of_phandle_args *dma_spec,  		struct of_dma *ofdma);  #else @@ -52,13 +51,12 @@ static inline int of_dma_controller_register(struct device_node *np,  	return -ENODEV;  } -static inline int of_dma_controller_free(struct device_node *np) +static inline void of_dma_controller_free(struct device_node *np)  { -	return -ENODEV;  }  static inline struct dma_chan *of_dma_request_slave_channel(struct device_node *np, -						     char *name) +						     const char *name)  {  	return NULL;  }  |