| Message ID | 1431644410-2997-5-git-send-email-laurent.pinchart+renesas@ideasonboard.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
(sorry for the mid-review delay, I got side-tracked yesterday evening) On Fri, May 15, 2015 at 12:00:05AM +0100, Laurent Pinchart wrote: > As part of moving DMA initializing to probe time the > of_dma_deconfigure() function will need to be called from different > source files. Make it public and move it to drivers/of/device.c where > the of_dma_configure() function is. > > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > --- > drivers/of/device.c | 12 ++++++++++++ > drivers/of/platform.c | 5 ----- > include/linux/of_device.h | 3 +++ > 3 files changed, 15 insertions(+), 5 deletions(-) Acked-by: Will Deacon <will.deacon@arm.com> Cheers, Will > diff --git a/drivers/of/device.c b/drivers/of/device.c > index 530aa1ed3e1b..f1b84f464fe1 100644 > --- a/drivers/of/device.c > +++ b/drivers/of/device.c > @@ -135,6 +135,18 @@ void of_dma_configure(struct device *dev, struct device_node *np) > } > EXPORT_SYMBOL_GPL(of_dma_configure); > > +/** > + * of_dma_deconfigure - Clean up DMA configuration > + * @dev: Device for which to clean up DMA configuration > + * > + * Clean up all configuration performed by of_dma_configure_ops() and free all > + * resources that have been allocated. > + */ > +void of_dma_deconfigure(struct device *dev) > +{ > + arch_teardown_dma_ops(dev); > +} > + > int of_device_register(struct platform_device *pdev) > { > device_initialize(&pdev->dev); > diff --git a/drivers/of/platform.c b/drivers/of/platform.c > index a01f57c9e34e..7a660c79ff84 100644 > --- a/drivers/of/platform.c > +++ b/drivers/of/platform.c > @@ -149,11 +149,6 @@ struct platform_device *of_device_alloc(struct device_node *np, > } > EXPORT_SYMBOL(of_device_alloc); > > -static void of_dma_deconfigure(struct device *dev) > -{ > - arch_teardown_dma_ops(dev); > -} > - > /** > * of_platform_device_create_pdata - Alloc, initialize and register an of_device > * @np: pointer to node to create device for > diff --git a/include/linux/of_device.h b/include/linux/of_device.h > index 22801b10cef5..6710807b0653 100644 > --- a/include/linux/of_device.h > +++ b/include/linux/of_device.h > @@ -54,6 +54,7 @@ static inline struct device_node *of_cpu_device_node_get(int cpu) > } > > void of_dma_configure(struct device *dev, struct device_node *np); > +void of_dma_deconfigure(struct device *dev); > #else /* CONFIG_OF */ > > static inline int of_driver_match_device(struct device *dev, > @@ -93,6 +94,8 @@ static inline struct device_node *of_cpu_device_node_get(int cpu) > } > static inline void of_dma_configure(struct device *dev, struct device_node *np) > {} > +static inline void of_dma_deconfigure(struct device *dev) > +{} > #endif /* CONFIG_OF */ > > #endif /* _LINUX_OF_DEVICE_H */ > -- > 2.3.6 >
On Thu, May 14, 2015 at 6:00 PM, Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> wrote: > As part of moving DMA initializing to probe time the > of_dma_deconfigure() function will need to be called from different > source files. Make it public and move it to drivers/of/device.c where > the of_dma_configure() function is. > > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> One minor fix below, but otherwise: Acked-by: Rob Herring <robh@kernel.org> > --- > drivers/of/device.c | 12 ++++++++++++ > drivers/of/platform.c | 5 ----- > include/linux/of_device.h | 3 +++ > 3 files changed, 15 insertions(+), 5 deletions(-) > > diff --git a/drivers/of/device.c b/drivers/of/device.c > index 530aa1ed3e1b..f1b84f464fe1 100644 > --- a/drivers/of/device.c > +++ b/drivers/of/device.c > @@ -135,6 +135,18 @@ void of_dma_configure(struct device *dev, struct device_node *np) > } > EXPORT_SYMBOL_GPL(of_dma_configure); > > +/** > + * of_dma_deconfigure - Clean up DMA configuration > + * @dev: Device for which to clean up DMA configuration > + * > + * Clean up all configuration performed by of_dma_configure_ops() and free all > + * resources that have been allocated. > + */ > +void of_dma_deconfigure(struct device *dev) > +{ > + arch_teardown_dma_ops(dev); > +} You need an EXPORT_SYMBOL_GPL
diff --git a/drivers/of/device.c b/drivers/of/device.c index 530aa1ed3e1b..f1b84f464fe1 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c @@ -135,6 +135,18 @@ void of_dma_configure(struct device *dev, struct device_node *np) } EXPORT_SYMBOL_GPL(of_dma_configure); +/** + * of_dma_deconfigure - Clean up DMA configuration + * @dev: Device for which to clean up DMA configuration + * + * Clean up all configuration performed by of_dma_configure_ops() and free all + * resources that have been allocated. + */ +void of_dma_deconfigure(struct device *dev) +{ + arch_teardown_dma_ops(dev); +} + int of_device_register(struct platform_device *pdev) { device_initialize(&pdev->dev); diff --git a/drivers/of/platform.c b/drivers/of/platform.c index a01f57c9e34e..7a660c79ff84 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -149,11 +149,6 @@ struct platform_device *of_device_alloc(struct device_node *np, } EXPORT_SYMBOL(of_device_alloc); -static void of_dma_deconfigure(struct device *dev) -{ - arch_teardown_dma_ops(dev); -} - /** * of_platform_device_create_pdata - Alloc, initialize and register an of_device * @np: pointer to node to create device for diff --git a/include/linux/of_device.h b/include/linux/of_device.h index 22801b10cef5..6710807b0653 100644 --- a/include/linux/of_device.h +++ b/include/linux/of_device.h @@ -54,6 +54,7 @@ static inline struct device_node *of_cpu_device_node_get(int cpu) } void of_dma_configure(struct device *dev, struct device_node *np); +void of_dma_deconfigure(struct device *dev); #else /* CONFIG_OF */ static inline int of_driver_match_device(struct device *dev, @@ -93,6 +94,8 @@ static inline struct device_node *of_cpu_device_node_get(int cpu) } static inline void of_dma_configure(struct device *dev, struct device_node *np) {} +static inline void of_dma_deconfigure(struct device *dev) +{} #endif /* CONFIG_OF */ #endif /* _LINUX_OF_DEVICE_H */
As part of moving DMA initializing to probe time the of_dma_deconfigure() function will need to be called from different source files. Make it public and move it to drivers/of/device.c where the of_dma_configure() function is. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- drivers/of/device.c | 12 ++++++++++++ drivers/of/platform.c | 5 ----- include/linux/of_device.h | 3 +++ 3 files changed, 15 insertions(+), 5 deletions(-)