Skip to content

Commit

Permalink
of/address: Constify of_busses[] array and pointers
Browse files Browse the repository at this point in the history
The of_busses array is fixed, so it and all struct of_bus pointers can
be const.

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20241010-dt-const-v1-7-87a51f558425@kernel.org
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
  • Loading branch information
robherring committed Oct 15, 2024
1 parent 3539089 commit d79616b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions drivers/of/address.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
{
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion include/linux/of_address.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit d79616b

Please sign in to comment.