Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e4bb835 authored by Saravana Kannan's avatar Saravana Kannan
Browse files

FROMGIT: of: property: Minor code formatting/style clean ups 



Better variable and function names. Remove "," after the sentinel in an
array initialization list.

Signed-off-by: default avatarSaravana Kannan <saravanak@google.com>
Acked-by: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20191011191521.179614-2-saravanak@google.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

(cherry-picked from commit af1b967af5ffb94aaed5b9b3259349cc2d398fa7
 https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git

 driver-core-next)
Conflicts: drivers/of/property.c
[Fixed minor conflict due to change id I7aa1b4315010fa5f3dc49c0903d164478ecdd1a7]
Bug: 142657042
Change-Id: I86356be325b17676452b9ad93fe4a96235dbef0b
Signed-off-by: default avatarSaravana Kannan <saravanak@google.com>
parent 56af6fc5

drivers/of/property.c

+6 −6
Original line number Diff line number Diff line
@@ -1154,12 +1154,12 @@ struct supplier_bindings { 
					  const char *prop_name, int index);

};



static const struct supplier_bindings bindings[] = {

static const struct supplier_bindings of_supplier_bindings[] = {

	{ .parse_prop = parse_clocks, },

	{ .parse_prop = parse_interconnects, },

	{ .parse_prop = parse_regulators, },

	{ .parse_prop = parse_iommus, },

	{},

	{}

};



/**
@@ -1185,7 +1185,7 @@ static int of_link_property(struct device *dev, struct device_node *con_np, 
			     const char *prop_name)

{

	struct device_node *phandle;

	const struct supplier_bindings *s = bindings;

	const struct supplier_bindings *s = of_supplier_bindings;

	unsigned int i = 0;

	bool matched = false;

	int ret = 0;
@@ -1204,7 +1204,7 @@ static int of_link_property(struct device *dev, struct device_node *con_np, 
	return ret;

}



static int __of_link_to_suppliers(struct device *dev,

static int of_link_to_suppliers(struct device *dev,

				  struct device_node *con_np)

{

	struct device_node *child;
@@ -1216,7 +1216,7 @@ static int __of_link_to_suppliers(struct device *dev, 
			ret = -EAGAIN;



	for_each_child_of_node(con_np, child)

		if (__of_link_to_suppliers(dev, child))

		if (of_link_to_suppliers(dev, child))

			ret = -EAGAIN;



	return ret;
@@ -1234,7 +1234,7 @@ static int of_fwnode_add_links(const struct fwnode_handle *fwnode, 
	if (unlikely(!is_of_node(fwnode)))

		return 0;



	return __of_link_to_suppliers(dev, to_of_node(fwnode));

	return of_link_to_suppliers(dev, to_of_node(fwnode));

}



const struct fwnode_operations of_fwnode_ops = {