diff options
Diffstat (limited to 'drivers/core')
| -rw-r--r-- | drivers/core/fdtaddr.c | 3 | ||||
| -rw-r--r-- | drivers/core/uclass.c | 3 | ||||
| -rw-r--r-- | drivers/core/util.c | 11 |
3 files changed, 4 insertions, 13 deletions
diff --git a/drivers/core/fdtaddr.c b/drivers/core/fdtaddr.c index b9874c743d..4ffbd6b2eb 100644 --- a/drivers/core/fdtaddr.c +++ b/drivers/core/fdtaddr.c @@ -200,8 +200,7 @@ fdt_addr_t devfdt_get_addr_pci(const struct udevice *dev) ulong addr; addr = devfdt_get_addr(dev); - if (CONFIG_IS_ENABLED(PCI) && IS_ENABLED(CONFIG_DM_PCI) && - addr == FDT_ADDR_T_NONE) { + if (CONFIG_IS_ENABLED(PCI) && addr == FDT_ADDR_T_NONE) { struct fdt_pci_addr pci_addr; u32 bar; int ret; diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c index 117d35ac49..3146dfd032 100644 --- a/drivers/core/uclass.c +++ b/drivers/core/uclass.c @@ -146,6 +146,9 @@ int uclass_get(enum uclass_id id, struct uclass **ucp) { struct uclass *uc; + /* Immediately fail if driver model is not set up */ + if (!gd->uclass_root) + return -EDEADLK; *ucp = NULL; uc = uclass_find(id); if (!uc) { diff --git a/drivers/core/util.c b/drivers/core/util.c index 91e93b0cf1..5be4ee79de 100644 --- a/drivers/core/util.c +++ b/drivers/core/util.c @@ -11,17 +11,6 @@ #include <linux/libfdt.h> #include <vsprintf.h> -#if CONFIG_IS_ENABLED(DM_WARN) -void dm_warn(const char *fmt, ...) -{ - va_list args; - - va_start(args, fmt); - vprintf(fmt, args); - va_end(args); -} -#endif - int list_count_items(struct list_head *head) { struct list_head *node; |