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

Commit 53a4ab96 authored by Kevin Cernekee's avatar Kevin Cernekee Committed by Grant Likely
Browse files

of: Change of_device_is_available() to return bool 



This function can only return true or false; using a bool makes it more
obvious to the reader.

Signed-off-by: default avatarKevin Cernekee <cernekee@gmail.com>
Signed-off-by: default avatarGrant Likely <grant.likely@linaro.org>
parent 25c7a1de

drivers/of/base.c

+11 −11
Original line number Diff line number Diff line
@@ -522,27 +522,27 @@ EXPORT_SYMBOL(of_machine_is_compatible); 
 *

 *  @device: Node to check for availability, with locks already held

 *

 *  Returns 1 if the status property is absent or set to "okay" or "ok",

 *  0 otherwise

 *  Returns true if the status property is absent or set to "okay" or "ok",

 *  false otherwise

 */

static int __of_device_is_available(const struct device_node *device)

static bool __of_device_is_available(const struct device_node *device)

{

	const char *status;

	int statlen;



	if (!device)

		return 0;

		return false;



	status = __of_get_property(device, "status", &statlen);

	if (status == NULL)

		return 1;

		return true;



	if (statlen > 0) {

		if (!strcmp(status, "okay") || !strcmp(status, "ok"))

			return 1;

			return true;

	}



	return 0;

	return false;

}



/**
@@ -550,13 +550,13 @@ static int __of_device_is_available(const struct device_node *device) 
 *

 *  @device: Node to check for availability

 *

 *  Returns 1 if the status property is absent or set to "okay" or "ok",

 *  0 otherwise

 *  Returns true if the status property is absent or set to "okay" or "ok",

 *  false otherwise

 */

int of_device_is_available(const struct device_node *device)

bool of_device_is_available(const struct device_node *device)

{

	unsigned long flags;

	int res;

	bool res;



	raw_spin_lock_irqsave(&devtree_lock, flags);

	res = __of_device_is_available(device);

include/linux/of.h

+3 −3
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ extern int of_property_read_string_helper(struct device_node *np, 
					      const char **out_strs, size_t sz, int index);

extern int of_device_is_compatible(const struct device_node *device,

				   const char *);

extern int of_device_is_available(const struct device_node *device);

extern bool of_device_is_available(const struct device_node *device);

extern const void *of_get_property(const struct device_node *node,

				const char *name,

				int *lenp);
@@ -427,9 +427,9 @@ static inline int of_device_is_compatible(const struct device_node *device, 
	return 0;

}



static inline int of_device_is_available(const struct device_node *device)

static inline bool of_device_is_available(const struct device_node *device)

{

	return 0;

	return false;

}



static inline struct property *of_find_property(const struct device_node *np,