dm: core: Switch uclass_*_device_err to use uclass_*_device_check

Clarify documentation, fix a few more cases that could be broken by the
change.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>

diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 5cff81ac443ee561fd6ce0eb58b73929bfcf1aa2..6dd19650f9ce8157f72b6433a43da99f72255b8e 100644 (file)
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -1777,10 +1777,9 @@ int pci_sriov_init(struct udevice *pdev, int vf_en)
 
        bdf = dm_pci_get_bdf(pdev);
 
-       pci_get_bus(PCI_BUS(bdf), &bus);
-
-       if (!bus)
-               return -ENODEV;
+       ret = pci_get_bus(PCI_BUS(bdf), &bus);
+       if (ret)
+               return ret;
 
        bdf += PCI_BDF(0, 0, vf_offset);
 

diff --git a/drivers/sysinfo/sysinfo-uclass.c b/drivers/sysinfo/sysinfo-uclass.c
index c5cc3cb9596bce525293fb8272c9733d674f1258..10194d0e14c358b3a1457a29f69452faf5654092 100644 (file)
--- a/drivers/sysinfo/sysinfo-uclass.c
+++ b/drivers/sysinfo/sysinfo-uclass.c
@@ -16,7 +16,15 @@ struct sysinfo_priv {
 
 int sysinfo_get(struct udevice **devp)
 {
-       return uclass_first_device_err(UCLASS_SYSINFO, devp);
+       int ret = uclass_first_device_err(UCLASS_SYSINFO, devp);
+
+       /*
+        * There is some very dodgy error handling in gazerbeam,
+        * do not return a device on error.
+        */
+       if (ret)
+               *devp = NULL;
+       return ret;
 }
 
 int sysinfo_detect(struct udevice *dev)

diff --git a/include/dm/uclass.h b/include/dm/uclass.h
index 823a16527f7071e9f5c01e906c9989311238359b..b1c016ef9f59911202e0200d906bb581f42ad9ba 100644 (file)
--- a/include/dm/uclass.h
+++ b/include/dm/uclass.h
@@ -350,7 +350,8 @@ int uclass_next_device(struct udevice **devp);
 /**
  * uclass_first_device_err() - Get the first device in a uclass
  *
- * The device returned is probed if necessary, and ready for use
+ * The device returned is probed if necessary, and ready for use if no error is
+ * returned
  *
  * @id: Uclass ID to look up
  * @devp: Returns pointer to the first device in that uclass, or NULL if none
@@ -361,7 +362,8 @@ int uclass_first_device_err(enum uclass_id id, 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
+ * The device returned is probed if necessary, and ready for use if no error is
+ * returned
  *
  * @devp: On entry, pointer to device to lookup. On exit, returns pointer
  * to the next device in the uclass if no error occurred, or NULL if
@@ -373,7 +375,8 @@ int uclass_next_device_err(struct udevice **devp);
 /**
  * uclass_first_device_check() - Get the first device in a uclass
  *
- * The device returned is probed if necessary, and ready for use
+ * The device returned is probed if necessary, and ready for use if no error is
+ * returned
  *
  * This function is useful to start iterating through a list of devices which
  * are functioning correctly and can be probed.
@@ -389,7 +392,8 @@ int uclass_first_device_check(enum uclass_id id, struct udevice **devp);
 /**
  * uclass_next_device_check() - Get the next device in a uclass
  *
- * The device returned is probed if necessary, and ready for use
+ * The device returned is probed if necessary, and ready for use if no error is
+ * returned
  *
  * This function is useful to start iterating through a list of devices which
  * are functioning correctly and can be probed.