dm: uclass: Add uclass_next_device_err() to return a valid device

Similarly to uclass_first_device_err(), add uclass_next_device_err()
which returns an error if there are no next devices in that uclass.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c
index 6cfcde8918c4dc4dfba1e722e82ccb1d9ec6b16b..d9c5719a878d75abdd76b51a81970936693e38b7 100644 (file)
--- a/drivers/core/uclass.c
+++ b/drivers/core/uclass.c
@@ -562,6 +562,19 @@ int uclass_next_device(struct udevice **devp)
        return uclass_get_device_tail(dev, ret, devp);
 }
 
+int uclass_next_device_err(struct udevice **devp)
+{
+       int ret;
+
+       ret = uclass_next_device(devp);
+       if (ret)
+               return ret;
+       else if (!*devp)
+               return -ENODEV;
+
+       return 0;
+}
+
 int uclass_first_device_check(enum uclass_id id, struct udevice **devp)
 {
        int ret;

diff --git a/include/dm/uclass.h b/include/dm/uclass.h
index 4ef0d0f0c01285cb314473b9a883cd525deafc86..93f761c96eb80f2e13d21c991a4bef5432ecc311 100644 (file)
--- a/include/dm/uclass.h
+++ b/include/dm/uclass.h
@@ -307,6 +307,18 @@ int uclass_first_device_err(enum uclass_id id, struct udevice **devp);
  */
 int uclass_next_device(struct udevice **devp);
 
+/**
+ * uclass_next_device_err() - Get the next device in a uclass
+ *
+ * The device returned is probed if necessary, and ready for use
+ *
+ * @devp: On entry, pointer to device to lookup. On exit, returns pointer
+ * to the next device in the uclass if no error occurred, or -ENODEV if
+ * there is no next device.
+ * @return 0 if found, -ENODEV if not found, other -ve on error
+ */
+int uclass_next_device_err(struct udevice **devp);
+
 /**
  * uclass_first_device_check() - Get the first device in a uclass
  *