Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753989AbdDDKrk (ORCPT ); Tue, 4 Apr 2017 06:47:40 -0400 Received: from foss.arm.com ([217.140.101.70]:42268 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753397AbdDDKri (ORCPT ); Tue, 4 Apr 2017 06:47:38 -0400 Subject: Re: [PATCH V10 04/12] of: dma: Make of_dma_deconfigure() public To: Sricharan R , will.deacon@arm.com, joro@8bytes.org, lorenzo.pieralisi@arm.com, iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, m.szyprowski@samsung.com, bhelgaas@google.com, linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, tn@semihalf.com, hanjun.guo@linaro.org, okaya@codeaurora.org, robh+dt@kernel.org, frowand.list@gmail.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, sudeep.holla@arm.com, rjw@rjwysocki.net, lenb@kernel.org, catalin.marinas@arm.com, arnd@arndb.de, linux-arch@vger.kernel.org, gregkh@linuxfoundation.org References: <1489086061-9356-1-git-send-email-sricharan@codeaurora.org> <1491301105-5274-1-git-send-email-sricharan@codeaurora.org> <1491301105-5274-5-git-send-email-sricharan@codeaurora.org> From: Robin Murphy Message-ID: <2b2b6268-ad58-4c10-8866-e44a777a4128@arm.com> Date: Tue, 4 Apr 2017 11:47:17 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <1491301105-5274-5-git-send-email-sricharan@codeaurora.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2762 Lines: 79 On 04/04/17 11:18, Sricharan R wrote: > From: Laurent Pinchart > > 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 > Tested-by: Marek Szyprowski > Signed-off-by: Laurent Pinchart > --- > 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 for > diff --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 */ >