summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2020-12-16 21:20:28 -0700
committerSimon Glass <sjg@chromium.org>2020-12-18 20:32:21 -0700
commitb5b11558bc2d7088dfbb67253d8b094782334dea (patch)
treea25d54fbc6bf0d82e391f853e4d68aded9a2687a
parent93f44e8a8c8c7878c76d3415f1d425d4fa418287 (diff)
downloadu-boot-b5b11558bc2d7088dfbb67253d8b094782334dea.tar.gz
dm: Drop uclass_resolve_seq()
This function is not needed anymore. Drop it. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--drivers/core/device.c8
-rw-r--r--drivers/core/uclass.c39
-rw-r--r--include/dm/uclass.h15
3 files changed, 0 insertions, 62 deletions
diff --git a/drivers/core/device.c b/drivers/core/device.c
index d2cf05c8c4..e8435b8ba4 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -421,7 +421,6 @@ int device_probe(struct udevice *dev)
{
const struct driver *drv;
int ret;
- int seq;
if (!dev)
return -EINVAL;
@@ -452,13 +451,6 @@ int device_probe(struct udevice *dev)
return 0;
}
- seq = uclass_resolve_seq(dev);
- if (seq < 0) {
- ret = seq;
- goto fail;
- }
- dev->seq = seq;
-
dev->flags |= DM_FLAG_ACTIVATED;
/*
diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c
index c8432b2d1c..78765e548e 100644
--- a/drivers/core/uclass.c
+++ b/drivers/core/uclass.c
@@ -680,45 +680,6 @@ int uclass_unbind_device(struct udevice *dev)
}
#endif
-int uclass_resolve_seq(struct udevice *dev)
-{
- struct uclass *uc = dev->uclass;
- struct uclass_driver *uc_drv = uc->uc_drv;
- struct udevice *dup;
- int seq = 0;
- int ret;
-
- assert(dev_seq(dev) == -1);
- ret = uclass_find_device_by_seq(uc_drv->id, dev->req_seq, false, &dup);
- if (!ret) {
- /* Do nothing here for now */
- } else if (ret == -ENODEV) {
- /* Our requested sequence number is available */
- if (dev->req_seq != -1)
- return dev->req_seq;
- } else {
- return ret;
- }
-
- if (CONFIG_IS_ENABLED(OF_CONTROL) && CONFIG_IS_ENABLED(DM_SEQ_ALIAS) &&
- (uc_drv->flags & DM_UC_FLAG_SEQ_ALIAS)) {
- /*
- * dev_read_alias_highest_id() will return -1 if there no
- * alias. Thus we can always add one.
- */
- seq = dev_read_alias_highest_id(uc_drv->name) + 1;
- }
-
- for (; seq < DM_MAX_SEQ; seq++) {
- ret = uclass_find_device_by_seq(uc_drv->id, seq, false, &dup);
- if (ret == -ENODEV)
- break;
- if (ret)
- return ret;
- }
- return seq;
-}
-
int uclass_pre_probe_device(struct udevice *dev)
{
struct uclass_driver *uc_drv;
diff --git a/include/dm/uclass.h b/include/dm/uclass.h
index c4cd58349e..91edbfb47d 100644
--- a/include/dm/uclass.h
+++ b/include/dm/uclass.h
@@ -369,21 +369,6 @@ int uclass_first_device_drvdata(enum uclass_id id, ulong driver_data,
struct udevice **devp);
/**
- * uclass_resolve_seq() - Resolve a device's sequence number
- *
- * On entry dev->seq is -1, and dev->req_seq may be -1 (to allocate a
- * sequence number automatically, or >= 0 to select a particular number.
- * If the requested sequence number is in use, then this device will
- * be allocated another one.
- *
- * Note that the device's seq value is not changed by this function.
- *
- * @dev: Device for which to allocate sequence number
- * @return sequence number allocated, or -ve on error
- */
-int uclass_resolve_seq(struct udevice *dev);
-
-/**
* uclass_id_foreach_dev() - Helper function to iteration through devices
*
* This creates a for() loop which works through the available devices in