]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
dm: blk: Do not use uclass_next_device_err
authorMichal Suchanek <msuchanek@suse.de>
Wed, 12 Oct 2022 19:58:01 +0000 (21:58 +0200)
committerSimon Glass <sjg@chromium.org>
Tue, 18 Oct 2022 03:17:12 +0000 (21:17 -0600)
blk_first_device_err/blk_next_device_err uses
uclass_first_device_err/uclass_next_device_err for device iteration.

Although the function names superficially match the return value from
uclass_first_device_err/uclass_next_device_err is never used
meaningfully, and uclass_first_device/uclass_next_device works equally
well for this purpose.

In the following patch the semantic of
uclass_first_device_err/uclass_next_device_err will be changed to be
based on uclass_first_device_check/uclass_next_device_check breaking
this sole user that uses uclass_next_device_err for iteration.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
drivers/block/blk-uclass.c

index 7d12d5413f18b99f2df1cf96150c1cb9fa70c7e8..bcc14a684be73749d7e86d95f944505b7031b6e0 100644 (file)
@@ -593,11 +593,9 @@ int blk_find_next(enum blk_flag_t flags, struct udevice **devp)
 
 int blk_first_device_err(enum blk_flag_t flags, struct udevice **devp)
 {
-       int ret;
-
-       for (ret = uclass_first_device_err(UCLASS_BLK, devp);
-            !ret;
-            ret = uclass_next_device_err(devp)) {
+       for (uclass_first_device(UCLASS_BLK, devp);
+            *devp;
+            uclass_next_device(devp)) {
                if (!blk_flags_check(*devp, flags))
                        return 0;
        }
@@ -607,11 +605,9 @@ int blk_first_device_err(enum blk_flag_t flags, struct udevice **devp)
 
 int blk_next_device_err(enum blk_flag_t flags, struct udevice **devp)
 {
-       int ret;
-
-       for (ret = uclass_next_device_err(devp);
-            !ret;
-            ret = uclass_next_device_err(devp)) {
+       for (uclass_next_device(devp);
+            *devp;
+            uclass_next_device(devp)) {
                if (!blk_flags_check(*devp, flags))
                        return 0;
        }