devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Rob Herring (Arm)" <robh@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>,
	 Andrew Morton <akpm@linux-foundation.org>,
	 Saravana Kannan <saravanak@google.com>
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
	 devicetree@vger.kernel.org
Subject: [PATCH 7/7] of/address: Constify of_busses[] array and pointers
Date: Thu, 10 Oct 2024 11:27:20 -0500	[thread overview]
Message-ID: <20241010-dt-const-v1-7-87a51f558425@kernel.org> (raw)
In-Reply-To: <20241010-dt-const-v1-0-87a51f558425@kernel.org>

The of_busses array is fixed, so it and all struct of_bus pointers can
be const.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
 drivers/of/address.c       | 12 ++++++------
 include/linux/of_address.h |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/of/address.c b/drivers/of/address.c
index aa1a4e381461..824bb449e007 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -340,7 +340,7 @@ static int of_bus_default_flags_match(struct device_node *np)
  * Array of bus specific translators
  */
 
-static struct of_bus of_busses[] = {
+static const struct of_bus of_busses[] = {
 #ifdef CONFIG_PCI
 	/* PCI */
 	{
@@ -388,7 +388,7 @@ static struct of_bus of_busses[] = {
 	},
 };
 
-static struct of_bus *of_match_bus(struct device_node *np)
+static const struct of_bus *of_match_bus(struct device_node *np)
 {
 	int i;
 
@@ -419,8 +419,8 @@ static int of_empty_ranges_quirk(const struct device_node *np)
 	return false;
 }
 
-static int of_translate_one(struct device_node *parent, struct of_bus *bus,
-			    struct of_bus *pbus, __be32 *addr,
+static int of_translate_one(const struct device_node *parent, const struct of_bus *bus,
+			    const struct of_bus *pbus, __be32 *addr,
 			    int na, int ns, int pna, const char *rprop)
 {
 	const __be32 *ranges;
@@ -505,7 +505,7 @@ static u64 __of_translate_address(struct device_node *node,
 {
 	struct device_node *dev __free(device_node) = of_node_get(node);
 	struct device_node *parent __free(device_node) = get_parent(dev);
-	struct of_bus *bus, *pbus;
+	const struct of_bus *bus, *pbus;
 	__be32 addr[OF_MAX_ADDR_CELLS];
 	int na, ns, pna, pns;
 
@@ -690,7 +690,7 @@ const __be32 *__of_get_address(struct device_node *dev, int index, int bar_no,
 	const __be32 *prop;
 	unsigned int psize;
 	struct device_node *parent __free(device_node) = of_get_parent(dev);
-	struct of_bus *bus;
+	const struct of_bus *bus;
 	int onesize, i, na, ns;
 
 	if (parent == NULL)
diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index bd46dbcc6e88..9e034363788a 100644
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -10,7 +10,7 @@ struct of_bus;
 
 struct of_pci_range_parser {
 	struct device_node *node;
-	struct of_bus *bus;
+	const struct of_bus *bus;
 	const __be32 *range;
 	const __be32 *end;
 	int na;

-- 
2.45.2


  parent reply	other threads:[~2024-10-10 16:28 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-10 16:27 [PATCH 0/7] of: Constify DT structs Rob Herring (Arm)
2024-10-10 16:27 ` [PATCH 1/7] PCI: Constify pci_register_io_range() fwnode_handle Rob Herring (Arm)
2024-10-10 22:07   ` Bjorn Helgaas
2024-10-11 14:58   ` Krzysztof Kozlowski
2024-10-10 16:27 ` [PATCH 2/7] logic_pio: Constify fwnode_handle Rob Herring (Arm)
2024-10-11 14:59   ` Krzysztof Kozlowski
2024-10-11 15:08     ` Rob Herring
2024-10-10 16:27 ` [PATCH 3/7] of: Constify struct device_node function arguments Rob Herring (Arm)
2024-10-11 15:13   ` Krzysztof Kozlowski
2024-10-10 16:27 ` [PATCH 4/7] of: Constify struct property pointers Rob Herring (Arm)
2024-10-11 15:17   ` Krzysztof Kozlowski
2024-10-10 16:27 ` [PATCH 5/7] of: Constify of_changeset_entry function arguments Rob Herring (Arm)
2024-10-11 15:18   ` Krzysztof Kozlowski
2024-10-10 16:27 ` [PATCH 6/7] of: Constify safe_name() kobject arg Rob Herring (Arm)
2024-10-11 15:18   ` Krzysztof Kozlowski
2024-10-10 16:27 ` Rob Herring (Arm) [this message]
2024-10-11 15:20 ` [PATCH 0/7] of: Constify DT structs Krzysztof Kozlowski

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=20241010-dt-const-v1-7-87a51f558425@kernel.org \
    --to=robh@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=bhelgaas@google.com \
    --cc=devicetree@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=saravanak@google.com \
    /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).