From: Rob Herring <robh@kernel.org>
To: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc: Florian Fainelli <f.fainelli@gmail.com>,
Arnd Bergmann <arnd@arndb.de>,
Frank Rowand <frowand.list@gmail.com>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Marek Vasut <marek.vasut@gmail.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Oza Pawandeep <oza.oza@broadcom.com>,
Stefan Wahren <wahrenst@gmx.net>,
Simon Horman <horms+renesas@verge.net.au>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Robin Murphy <robin.murphy@arm.com>,
Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Subject: [PATCH 02/11] of: Make of_dma_get_range() private
Date: Thu, 26 Sep 2019 19:24:46 -0500 [thread overview]
Message-ID: <20190927002455.13169-3-robh@kernel.org> (raw)
In-Reply-To: <20190927002455.13169-1-robh@kernel.org>
of_dma_get_range() is only used within the DT core code, so remove the
export and move the header declaration to the private header.
Cc: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Rob Herring <robh@kernel.org>
---
drivers/of/address.c | 1 -
drivers/of/of_private.h | 11 +++++++++++
include/linux/of_address.h | 8 --------
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/drivers/of/address.c b/drivers/of/address.c
index 0c3cf515c510..8e354d12fb04 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -972,7 +972,6 @@ int of_dma_get_range(struct device_node *np, u64 *dma_addr, u64 *paddr, u64 *siz
return ret;
}
-EXPORT_SYMBOL_GPL(of_dma_get_range);
/**
* of_dma_is_coherent - Check if device is coherent
diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h
index 24786818e32e..f8c58615c393 100644
--- a/drivers/of/of_private.h
+++ b/drivers/of/of_private.h
@@ -158,4 +158,15 @@ extern void __of_sysfs_remove_bin_file(struct device_node *np,
#define for_each_transaction_entry_reverse(_oft, _te) \
list_for_each_entry_reverse(_te, &(_oft)->te_list, node)
+#ifdef CONFIG_OF_ADDRESS
+extern int of_dma_get_range(struct device_node *np, u64 *dma_addr,
+ u64 *paddr, u64 *size);
+#else
+static inline int of_dma_get_range(struct device_node *np, u64 *dma_addr,
+ u64 *paddr, u64 *size)
+{
+ return -ENODEV;
+}
+#endif
+
#endif /* _LINUX_OF_PRIVATE_H */
diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index e317f375374a..ddda3936039c 100644
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -51,8 +51,6 @@ extern int of_pci_dma_range_parser_init(struct of_pci_range_parser *parser,
extern struct of_pci_range *of_pci_range_parser_one(
struct of_pci_range_parser *parser,
struct of_pci_range *range);
-extern int of_dma_get_range(struct device_node *np, u64 *dma_addr,
- u64 *paddr, u64 *size);
extern bool of_dma_is_coherent(struct device_node *np);
#else /* CONFIG_OF_ADDRESS */
static inline void __iomem *of_io_request_and_map(struct device_node *device,
@@ -92,12 +90,6 @@ static inline struct of_pci_range *of_pci_range_parser_one(
return NULL;
}
-static inline int of_dma_get_range(struct device_node *np, u64 *dma_addr,
- u64 *paddr, u64 *size)
-{
- return -ENODEV;
-}
-
static inline bool of_dma_is_coherent(struct device_node *np)
{
return false;
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-09-27 0:25 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-27 0:24 [PATCH 00/11] of: dma-ranges fixes and improvements Rob Herring
2019-09-27 0:24 ` [PATCH 01/11] of: Remove unused of_find_matching_node_by_address() Rob Herring
2019-09-27 9:17 ` Geert Uytterhoeven
2019-09-30 12:49 ` Christoph Hellwig
2019-09-27 0:24 ` Rob Herring [this message]
2019-09-27 9:18 ` [PATCH 02/11] of: Make of_dma_get_range() private Geert Uytterhoeven
2019-09-30 12:53 ` Christoph Hellwig
2019-09-27 0:24 ` [PATCH 03/11] of: address: Report of_dma_get_range() errors meaningfully Rob Herring
2019-09-27 9:15 ` Geert Uytterhoeven
2019-09-30 12:54 ` Christoph Hellwig
2019-09-27 0:24 ` [PATCH 04/11] of/unittest: Add dma-ranges address translation tests Rob Herring
2019-09-27 0:24 ` [PATCH 05/11] of: Ratify of_dma_configure() interface Rob Herring
2019-09-30 12:57 ` Christoph Hellwig
2019-09-30 13:32 ` Nicolas Saenz Julienne
2019-09-30 21:24 ` Rob Herring
2019-10-01 15:43 ` Nicolas Saenz Julienne
2019-10-04 1:53 ` Rob Herring
2019-10-07 17:51 ` Nicolas Saenz Julienne
2019-09-27 0:24 ` [PATCH 06/11] of/address: Introduce of_get_next_dma_parent() helper Rob Herring
2019-09-27 9:24 ` Geert Uytterhoeven
2019-09-27 0:24 ` [PATCH 07/11] of: address: Follow DMA parent for "dma-coherent" Rob Herring
2019-09-27 0:24 ` [PATCH 08/11] of: Factor out #{addr,size}-cells parsing Rob Herring
2019-09-27 9:27 ` Geert Uytterhoeven
2019-09-27 0:24 ` [PATCH 09/11] of: Make of_dma_get_range() work on bus nodes Rob Herring
2019-09-27 0:24 ` [PATCH 10/11] of/address: Translate 'dma-ranges' for parent nodes missing 'dma-ranges' Rob Herring
2019-09-27 0:24 ` [PATCH 11/11] of/address: Fix of_pci_range_parser_one translation of DMA addresses Rob Herring
2019-09-29 11:16 ` [PATCH 00/11] of: dma-ranges fixes and improvements Arnd Bergmann
2019-09-30 8:20 ` Christoph Hellwig
2019-09-30 8:56 ` Thierry Reding
2019-09-30 9:55 ` Robin Murphy
2019-09-30 13:35 ` Thierry Reding
2019-09-30 9:20 ` Nicolas Saenz Julienne
2019-09-30 12:40 ` Marek Vasut
2019-09-30 12:52 ` Robin Murphy
2019-09-30 12:54 ` Marek Vasut
2019-09-30 13:05 ` Robin Murphy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190927002455.13169-3-robh@kernel.org \
--to=robh@kernel.org \
--cc=arnd@arndb.de \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=frowand.list@gmail.com \
--cc=geert+renesas@glider.be \
--cc=horms+renesas@verge.net.au \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=marek.vasut@gmail.com \
--cc=nsaenzjulienne@suse.de \
--cc=oza.oza@broadcom.com \
--cc=robin.murphy@arm.com \
--cc=wahrenst@gmx.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).