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

Commit 5fba49e3 authored by Stephen Warren's avatar Stephen Warren Committed by Grant Likely
Browse files

of: move of_parse_phandle() 



Move of_parse_phandle() after __of_parse_phandle_with_args(), since a
future patch will call __of_parse_phandle_with_args() from
of_parse_phandle(). Moving the function avoids adding a prototype. Doing
the move separately highlights the code changes separately.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarGrant Likely <grant.likely@linaro.org>
parent eded9dd4

drivers/of/base.c

+24 −24
Original line number Original line Diff line number Diff line
@@ -1080,30 +1080,6 @@ int of_property_count_strings(struct device_node *np, const char *propname) 
}

}

EXPORT_SYMBOL_GPL(of_property_count_strings);

EXPORT_SYMBOL_GPL(of_property_count_strings);





/**

 * of_parse_phandle - Resolve a phandle property to a device_node pointer

 * @np: Pointer to device node holding phandle property

 * @phandle_name: Name of property holding a phandle value

 * @index: For properties holding a table of phandles, this is the index into

 *         the table

 *

 * Returns the device_node pointer with refcount incremented.  Use

 * of_node_put() on it when done.

 */

struct device_node *of_parse_phandle(const struct device_node *np,

				     const char *phandle_name, int index)

{

	const __be32 *phandle;

	int size;



	phandle = of_get_property(np, phandle_name, &size);

	if ((!phandle) || (size < sizeof(*phandle) * (index + 1)))

		return NULL;



	return of_find_node_by_phandle(be32_to_cpup(phandle + index));

}

EXPORT_SYMBOL(of_parse_phandle);



static int __of_parse_phandle_with_args(const struct device_node *np,

static int __of_parse_phandle_with_args(const struct device_node *np,

					const char *list_name,

					const char *list_name,

					const char *cells_name, int index,

					const char *cells_name, int index,
@@ -1206,6 +1182,30 @@ static int __of_parse_phandle_with_args(const struct device_node *np, 
	return rc;

	return rc;

}

}





/**

 * of_parse_phandle - Resolve a phandle property to a device_node pointer

 * @np: Pointer to device node holding phandle property

 * @phandle_name: Name of property holding a phandle value

 * @index: For properties holding a table of phandles, this is the index into

 *         the table

 *

 * Returns the device_node pointer with refcount incremented.  Use

 * of_node_put() on it when done.

 */

struct device_node *of_parse_phandle(const struct device_node *np,

				     const char *phandle_name, int index)

{

	const __be32 *phandle;

	int size;



	phandle = of_get_property(np, phandle_name, &size);

	if ((!phandle) || (size < sizeof(*phandle) * (index + 1)))

		return NULL;



	return of_find_node_by_phandle(be32_to_cpup(phandle + index));

}

EXPORT_SYMBOL(of_parse_phandle);



/**

/**

 * of_parse_phandle_with_args() - Find a node pointed by phandle in a list

 * of_parse_phandle_with_args() - Find a node pointed by phandle in a list

 * @np:		pointer to a device tree node containing a list

 * @np:		pointer to a device tree node containing a list