diff options
| author | Simon Glass | 2020-12-16 21:20:26 -0700 |
|---|---|---|
| committer | Simon Glass | 2020-12-18 20:32:21 -0700 |
| commit | 981426e350801f2de93f385a371270f27dfeeb14 (patch) | |
| tree | b0819e0a28e619c7679c0ba1aa39bf9fa4c1f355 /drivers/core | |
| parent | 3bc90aa7438ea88721684f9ab7e1735df29f5171 (diff) | |
dm: Switch over to use new sequence number for dev_seq()
Update this function to use the new sequence number and fix up the test
that deals with this.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/core')
| -rw-r--r-- | drivers/core/uclass.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c index 96b7d16f3fc..c8432b2d1c3 100644 --- a/drivers/core/uclass.c +++ b/drivers/core/uclass.c @@ -306,8 +306,7 @@ int uclass_find_device_by_seq(enum uclass_id id, int seq_or_req_seq, uclass_foreach_dev(dev, uc) { log_debug(" - %d %d '%s'\n", dev->req_seq, dev_seq(dev), dev->name); - if ((find_req_seq ? dev->req_seq : dev_seq(dev)) == - seq_or_req_seq) { + if (dev_seq(dev) == seq_or_req_seq) { *devp = dev; log_debug(" - found\n"); return 0; @@ -692,8 +691,7 @@ int uclass_resolve_seq(struct udevice *dev) assert(dev_seq(dev) == -1); ret = uclass_find_device_by_seq(uc_drv->id, dev->req_seq, false, &dup); if (!ret) { - dm_warn("Device '%s': seq %d is in use by '%s'\n", - dev->name, dev->req_seq, dup->name); + /* Do nothing here for now */ } else if (ret == -ENODEV) { /* Our requested sequence number is available */ if (dev->req_seq != -1) |