diff options
| author | Simon Glass <sjg@chromium.org> | 2020-12-19 10:40:13 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2021-01-05 12:24:41 -0700 |
| commit | 7d14ee443ca674314e0fe5c3e25f48e52a8fd5ee (patch) | |
| tree | 2cf54ccfc6126a99a71b53fb4feaf7c0b4efa985 /include | |
| parent | c23405f8176c8d32d36ad992eb203ec87c4f5507 (diff) | |
| download | u-boot-7d14ee443ca674314e0fe5c3e25f48e52a8fd5ee.zip u-boot-7d14ee443ca674314e0fe5c3e25f48e52a8fd5ee.tar.gz u-boot-7d14ee443ca674314e0fe5c3e25f48e52a8fd5ee.tar.bz2 | |
dm: core: Use dev_has_ofnode() instead of dev_of_valid()
We have two functions which do the same thing. Standardise on
dev_has_ofnode() since there is no such thing as an 'invalid' ofnode in
normal operation: it is either null or missing.
Also move the functions into one place.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/dm/device.h | 13 | ||||
| -rw-r--r-- | include/dm/read.h | 16 |
2 files changed, 12 insertions, 17 deletions
diff --git a/include/dm/device.h b/include/dm/device.h index b15a14e..4a1224b 100644 --- a/include/dm/device.h +++ b/include/dm/device.h @@ -192,6 +192,17 @@ static inline void dev_bic_flags(struct udevice *dev, u32 bic) dev->flags_ &= ~bic; } +/** + * dev_ofnode() - get the DT node reference associated with a udevice + * + * @dev: device to check + * @return reference of the the device's DT node + */ +static inline ofnode dev_ofnode(const struct udevice *dev) +{ + return dev->node; +} + /* Returns non-zero if the device is active (probed and not removed) */ #define device_active(dev) (dev_get_flags(dev) & DM_FLAG_ACTIVATED) @@ -200,7 +211,7 @@ static inline int dev_of_offset(const struct udevice *dev) return ofnode_to_offset(dev->node); } -static inline bool dev_has_ofnode(struct udevice *dev) +static inline bool dev_has_ofnode(const struct udevice *dev) { return ofnode_valid(dev->node); } diff --git a/include/dm/read.h b/include/dm/read.h index 0585eb1..d5cdd87 100644 --- a/include/dm/read.h +++ b/include/dm/read.h @@ -30,22 +30,6 @@ static inline const struct device_node *dev_np(const struct udevice *dev) } #endif -/** - * dev_ofnode() - get the DT node reference associated with a udevice - * - * @dev: device to check - * @return reference of the the device's DT node - */ -static inline ofnode dev_ofnode(const struct udevice *dev) -{ - return dev->node; -} - -static inline bool dev_of_valid(const struct udevice *dev) -{ - return ofnode_valid(dev_ofnode(dev)); -} - #ifndef CONFIG_DM_DEV_READ_INLINE /** |