From: Zijun Hu <quic_zijuhu@xxxxxxxxxxx> API of_property_present() invokes of_property_read_bool() to check if a property is present or not, and that has 2 shortcomings shown below: - That narrows down property scope applicable to of_property_present() from all kinds of property to only bool type. - That is less logical since it says a property's presence is decided by its bool property value. Fix by making of_property_read_bool() invoke of_property_present(). Signed-off-by: Zijun Hu <quic_zijuhu@xxxxxxxxxxx> --- include/linux/of.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/include/linux/of.h b/include/linux/of.h index d451c46132b01efe6d4e0b6cf83a3e2084bb3ec6..fe5d7b74c23b9701743f5debc3d030b765bc914f 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -1242,17 +1242,16 @@ static inline int of_property_read_string_index(const struct device_node *np, } /** - * of_property_read_bool - Find a property - * @np: device node from which the property value is to be read. + * of_property_present - Test if a property is present in a node + * @np: device node to search for the property. * @propname: name of the property to be searched. * - * Search for a boolean property in a device node. Usage on non-boolean - * property types is deprecated. + * Test for a property present in a device node. * * Return: true if the property exists false otherwise. */ -static inline bool of_property_read_bool(const struct device_node *np, - const char *propname) +static inline bool of_property_present(const struct device_node *np, + const char *propname) { const struct property *prop = of_find_property(np, propname, NULL); @@ -1260,17 +1259,19 @@ static inline bool of_property_read_bool(const struct device_node *np, } /** - * of_property_present - Test if a property is present in a node - * @np: device node to search for the property. + * of_property_read_bool - Find a property + * @np: device node from which the property value is to be read. * @propname: name of the property to be searched. * - * Test for a property present in a device node. + * Search for a boolean property in a device node. Usage on non-boolean + * property types is deprecated. * * Return: true if the property exists false otherwise. */ -static inline bool of_property_present(const struct device_node *np, const char *propname) +static inline bool of_property_read_bool(const struct device_node *np, + const char *propname) { - return of_property_read_bool(np, propname); + return of_property_present(np, propname); } /** -- 2.34.1