diff options
| author | Tom Rini <trini@konsulko.com> | 2021-08-09 16:27:06 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-08-09 16:27:06 +0300 |
| commit | 0dec2030ccc686eae4616d1ce57d41eaed15685e (patch) | |
| tree | 5e9a34e4d51c4587a2138a2de969361ad3ec1f2c /include | |
| parent | 3823315cbedf930c52fe77452063ab6d62b157be (diff) | |
| parent | e679f39f7fc3eb083b2f957d748f81bbdc28f28c (diff) | |
| download | u-boot-0dec2030ccc686eae4616d1ce57d41eaed15685e.tar.xz | |
Merge tag 'dm-pull-8aug21' of https://source.denx.de/u-boot/custodians/u-boot-dm
Use log subsystem for dm_warn()
Various minor bug fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/dm/uclass.h | 3 | ||||
| -rw-r--r-- | include/dm/util.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/dm/uclass.h b/include/dm/uclass.h index 2778818b52..da0c1bfadb 100644 --- a/include/dm/uclass.h +++ b/include/dm/uclass.h @@ -159,7 +159,8 @@ void *uclass_get_priv(const struct uclass *uc); * * @key: ID to look up * @ucp: Returns pointer to uclass (there is only one per ID) - * @return 0 if OK, -ve on error + * @return 0 if OK, -EDEADLK if driver model is not yet inited, other -ve on + * other error */ int uclass_get(enum uclass_id key, struct uclass **ucp); diff --git a/include/dm/util.h b/include/dm/util.h index 138893c935..c634e470e7 100644 --- a/include/dm/util.h +++ b/include/dm/util.h @@ -7,7 +7,7 @@ #define __DM_UTIL_H #if CONFIG_IS_ENABLED(DM_WARN) -void dm_warn(const char *fmt, ...); +#define dm_warn(fmt...) log(LOGC_DM, LOGL_WARNING, ##fmt) #else static inline void dm_warn(const char *fmt, ...) { |