dm: core: Drop a few early returns
authorSimon Glass <sjg@chromium.org>
Wed, 25 Sep 2019 14:55:47 +0000 (08:55 -0600)
committerBin Meng <bmeng.cn@gmail.com>
Tue, 8 Oct 2019 05:57:37 +0000 (13:57 +0800)
Two functions in this file return early for no good reason. Adjust the
code to match the standard DM style of returning 0 at the end of the
function on success.

Oddly enough this save 12 bytes of code size on ARM.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
drivers/core/uclass.c

index b33296542f63ddfed35739ea891483b03d5504e6..af575bbeb72c810f853a3a1f130296119880f797 100644 (file)
@@ -714,8 +714,11 @@ int uclass_pre_probe_device(struct udevice *dev)
        if (!dev->parent)
                return 0;
        uc_drv = dev->parent->uclass->uc_drv;
-       if (uc_drv->child_pre_probe)
-               return uc_drv->child_pre_probe(dev);
+       if (uc_drv->child_pre_probe) {
+               ret = uc_drv->child_pre_probe(dev);
+               if (ret)
+                       return ret;
+       }
 
        return 0;
 }
@@ -735,8 +738,11 @@ int uclass_post_probe_device(struct udevice *dev)
        }
 
        uc_drv = dev->uclass->uc_drv;
-       if (uc_drv->post_probe)
-               return uc_drv->post_probe(dev);
+       if (uc_drv->post_probe) {
+               ret = uc_drv->post_probe(dev);
+               if (ret)
+                       return ret;
+       }
 
        return 0;
 }