uclass: add uclass_find_device_by_phandle_id() helper
The functions uclass_find_device_by_phandle() and uclass_get_device_by_phandle_id() both loop over a given uclass looking for a device with a given phandle. Factor that out to a common helper. For now, there are no (known potential) users of the new helper outside uclass.c, so make it static. Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> Reviewed-by: Simon Glass <sjg@chromium.org> Fix warning on sandbox_spl; fix code style: Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
committed by
Simon Glass
parent
763f0a1f0d
commit
6ebb357a6a
@@ -411,18 +411,14 @@ done:
|
||||
}
|
||||
|
||||
#if CONFIG_IS_ENABLED(OF_REAL)
|
||||
int uclass_find_device_by_phandle(enum uclass_id id, struct udevice *parent,
|
||||
const char *name, struct udevice **devp)
|
||||
static int uclass_find_device_by_phandle_id(enum uclass_id id,
|
||||
uint find_phandle,
|
||||
struct udevice **devp)
|
||||
{
|
||||
struct udevice *dev;
|
||||
struct uclass *uc;
|
||||
int find_phandle;
|
||||
int ret;
|
||||
|
||||
*devp = NULL;
|
||||
find_phandle = dev_read_u32_default(parent, name, -1);
|
||||
if (find_phandle <= 0)
|
||||
return -ENOENT;
|
||||
ret = uclass_get(id, &uc);
|
||||
if (ret)
|
||||
return ret;
|
||||
@@ -440,6 +436,19 @@ int uclass_find_device_by_phandle(enum uclass_id id, struct udevice *parent,
|
||||
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
int uclass_find_device_by_phandle(enum uclass_id id, struct udevice *parent,
|
||||
const char *name, struct udevice **devp)
|
||||
{
|
||||
int find_phandle;
|
||||
|
||||
*devp = NULL;
|
||||
find_phandle = dev_read_u32_default(parent, name, -1);
|
||||
if (find_phandle <= 0)
|
||||
return -ENOENT;
|
||||
|
||||
return uclass_find_device_by_phandle_id(id, find_phandle, devp);
|
||||
}
|
||||
#endif
|
||||
|
||||
int uclass_get_device_by_driver(enum uclass_id id,
|
||||
@@ -535,31 +544,16 @@ int uclass_get_device_by_ofnode(enum uclass_id id, ofnode node,
|
||||
return uclass_get_device_tail(dev, ret, devp);
|
||||
}
|
||||
|
||||
#if CONFIG_IS_ENABLED(OF_CONTROL)
|
||||
#if CONFIG_IS_ENABLED(OF_REAL)
|
||||
int uclass_get_device_by_phandle_id(enum uclass_id id, uint phandle_id,
|
||||
struct udevice **devp)
|
||||
{
|
||||
struct udevice *dev;
|
||||
struct uclass *uc;
|
||||
int ret;
|
||||
|
||||
*devp = NULL;
|
||||
ret = uclass_get(id, &uc);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
uclass_foreach_dev(dev, uc) {
|
||||
uint phandle;
|
||||
|
||||
phandle = dev_read_phandle(dev);
|
||||
|
||||
if (phandle == phandle_id) {
|
||||
*devp = dev;
|
||||
return uclass_get_device_tail(dev, ret, devp);
|
||||
}
|
||||
}
|
||||
|
||||
return -ENODEV;
|
||||
ret = uclass_find_device_by_phandle_id(id, phandle_id, &dev);
|
||||
return uclass_get_device_tail(dev, ret, devp);
|
||||
}
|
||||
|
||||
int uclass_get_device_by_phandle(enum uclass_id id, struct udevice *parent,
|
||||
|
||||
Reference in New Issue
Block a user