Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 19:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dm: Drop uclass_resolve_seq()

Browse source 
This function is not needed anymore. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2020-12-16 21:20:28 -07:00
parent 93f44e8a8c
commit b5b11558bc
3 changed files with 0 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/core/device.c
View file

@ -421,7 +421,6 @@ int device_probe(struct udevice *dev)
{ {
const struct driver *drv; const struct driver *drv;
int ret; int ret;
int seq;
if (!dev) if (!dev)
return -EINVAL; return -EINVAL;
@ -452,13 +451,6 @@ int device_probe(struct udevice *dev)
return 0; return 0;
} }
seq = uclass_resolve_seq(dev);
if (seq < 0) {
ret = seq;
goto fail;
}
dev->seq = seq;
dev->flags |= DM_FLAG_ACTIVATED; dev->flags |= DM_FLAG_ACTIVATED;
/* /*

39
drivers/core/uclass.c
View file

@ -680,45 +680,6 @@ int uclass_unbind_device(struct udevice *dev)
} }
#endif #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) int uclass_pre_probe_device(struct udevice *dev)
{ {
struct uclass_driver *uc_drv; struct uclass_driver *uc_drv;

15
include/dm/uclass.h
View file

@ -368,21 +368,6 @@ int uclass_next_device_check(struct udevice **devp);
int uclass_first_device_drvdata(enum uclass_id id, ulong driver_data, int uclass_first_device_drvdata(enum uclass_id id, ulong driver_data,
struct udevice **devp); 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 * uclass_id_foreach_dev() - Helper function to iteration through devices
* *