diff options
author | Simon Glass <sjg@chromium.org> | 2020-12-19 10:40:09 -0700 |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2021-01-05 12:24:41 -0700 |
commit | 2462139fdd4f1f5eb50427e287a802b9c9eef097 (patch) | |
tree | 894eea47a05bffc74ee70162ebe0eb065540de68 /drivers | |
parent | 82021e31a71ae51bea1226e58727dd3163a26895 (diff) | |
download | u-boot-2462139fdd4f1f5eb50427e287a802b9c9eef097.zip u-boot-2462139fdd4f1f5eb50427e287a802b9c9eef097.tar.gz u-boot-2462139fdd4f1f5eb50427e287a802b9c9eef097.tar.bz2 |
dm: core: Rename sqq to seq_
Now that the sequence-numbering migration is complete, rename this member
back to seq_, adding an underscore to indicate it is internal to driver
model.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/core/device.c | 8 | ||||
-rw-r--r-- | drivers/core/dump.c | 2 | ||||
-rw-r--r-- | drivers/core/uclass.c | 8 | ||||
-rw-r--r-- | drivers/pci/pci-uclass.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/drivers/core/device.c b/drivers/core/device.c index 7216963..f4ae778 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -73,7 +73,7 @@ static int device_bind_common(struct udevice *parent, const struct driver *drv, dev->driver = drv; dev->uclass = uc; - dev->sqq = -1; + dev->seq_ = -1; if (CONFIG_IS_ENABLED(DM_SEQ_ALIAS) && (uc->uc_drv->flags & DM_UC_FLAG_SEQ_ALIAS)) { /* @@ -83,13 +83,13 @@ static int device_bind_common(struct udevice *parent, const struct driver *drv, if (CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)) { if (uc->uc_drv->name && ofnode_valid(node)) { - if (!dev_read_alias_seq(dev, &dev->sqq)) + if (!dev_read_alias_seq(dev, &dev->seq_)) auto_seq = false; } } } if (auto_seq && !(uc->uc_drv->flags & DM_UC_FLAG_NO_AUTO_SEQ)) - dev->sqq = uclass_find_next_free_seq(uc); + dev->seq_ = uclass_find_next_free_seq(uc); if (drv->plat_auto) { bool alloc = !plat; @@ -658,7 +658,7 @@ int device_find_child_by_seq(const struct udevice *parent, int seq, *devp = NULL; list_for_each_entry(dev, &parent->child_head, sibling_node) { - if (dev->sqq == seq) { + if (dev->seq_ == seq) { *devp = dev; return 0; } diff --git a/drivers/core/dump.c b/drivers/core/dump.c index 7784ec0..1d4628a 100644 --- a/drivers/core/dump.c +++ b/drivers/core/dump.c @@ -69,7 +69,7 @@ static void dm_display_line(struct udevice *dev, int index) printf("%-3i %c %s @ %08lx", index, dev->flags & DM_FLAG_ACTIVATED ? '*' : ' ', dev->name, (ulong)map_to_sysmem(dev)); - if (dev->sqq != -1) + if (dev->seq_ != -1) printf(", seq %d", dev_seq(dev)); puts("\n"); } diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c index f60bc9a..e773e34 100644 --- a/drivers/core/uclass.c +++ b/drivers/core/uclass.c @@ -297,8 +297,8 @@ int uclass_find_next_free_seq(struct uclass *uc) /* Avoid conflict with existing devices */ list_for_each_entry(dev, &uc->dev_head, uclass_node) { - if (dev->sqq > max) - max = dev->sqq; + if (dev->seq_ > max) + max = dev->seq_; } /* * At this point, max will be -1 if there are no existing aliases or @@ -323,8 +323,8 @@ int uclass_find_device_by_seq(enum uclass_id id, int seq, struct udevice **devp) return ret; uclass_foreach_dev(dev, uc) { - log_debug(" - %d '%s'\n", dev->sqq, dev->name); - if (dev->sqq == seq) { + log_debug(" - %d '%s'\n", dev->seq_, dev->name); + if (dev->seq_ == seq) { *devp = dev; log_debug(" - found\n"); return 0; diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index 37a2338..1f6c51f 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -1019,7 +1019,7 @@ static int pci_uclass_pre_probe(struct udevice *bus) ret = uclass_get(UCLASS_PCI, &uc); if (ret) return ret; - bus->sqq = uclass_find_next_free_seq(uc); + bus->seq_ = uclass_find_next_free_seq(uc); } /* For bridges, use the top-level PCI controller */ |