[PATCH V10 04/12] of: dma: Make of_dma_deconfigure() public
From: robin.murphy@arm.com (Robin Murphy)
Date: 2017-04-04 10:47:40
Also in:
linux-acpi, linux-arch, linux-arm-msm, linux-devicetree, linux-iommu, linux-pci, lkml
On 04/04/17 11:18, Sricharan R wrote:
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> 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.
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
quoted hunk ↗ jump to hunk
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> 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(-)diff --git a/drivers/of/device.c b/drivers/of/device.c index 09dedd0..c17c19d 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c@@ -136,6 +136,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 5dfcc96..5344db5 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c@@ -158,11 +158,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 fordiff --git a/include/linux/of_device.h b/include/linux/of_device.h index c12dace..af98455 100644 --- a/include/linux/of_device.h +++ b/include/linux/of_device.h@@ -56,6 +56,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,@@ -105,6 +106,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 */