diff options
| author | Kevin Cernekee <cernekee@gmail.com> | 2014-11-12 12:54:01 -0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-12-16 15:29:10 +0800 |
| commit | 8140cee50a147187e4280f495f4e97fbc54e908a (patch) | |
| tree | 2b4fb425cffe1dee2a658212f5ddc9a048b62cf8 | |
| parent | a1b254b6481389d3a9835d51cf435e764b8cebe5 (diff) | |
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: Kevin Cernekee <cernekee@gmail.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
(cherry picked from commit 53a4ab96c61a34d62717b1481f6043e0b4338d74)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
| -rw-r--r-- | drivers/of/base.c | 22 | ||||
| -rw-r--r-- | include/linux/of.h | 6 |
2 files changed, 14 insertions, 14 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index 210c876ea579..1ac7a31522ef 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -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); diff --git a/include/linux/of.h b/include/linux/of.h index e947d64dd594..6c04a155e998 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -280,7 +280,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); @@ -431,9 +431,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, |