diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2023-07-28 10:50:32 +0200 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2023-08-24 03:04:17 +0200 |
| commit | b7a46e7b44115e186a68a7d95bef5e7d72826304 (patch) | |
| tree | 4512ce535a95069e08b6b8aee5a1bceef3379094 | |
| parent | of: unittest: Improve messages and comments in apply/revert checks (diff) | |
| download | linux-b7a46e7b44115e186a68a7d95bef5e7d72826304.tar.xz linux-b7a46e7b44115e186a68a7d95bef5e7d72826304.zip | |
of: unittest: Merge of_unittest_apply{,_revert}_overlay_check()
of_unittest_apply_overlay_check() and the first part of
of_unittest_apply_revert_overlay_check() are identical.
Reduce code duplication by replacing them by two wrappers around a
common helper.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/4bafe338655beab6b244047e737c0c2aa60b613d.1690533838.git.geert+renesas@glider.be
Signed-off-by: Rob Herring <robh@kernel.org>
| -rw-r--r-- | drivers/of/unittest.c | 45 |
1 files changed, 18 insertions, 27 deletions
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 35a621e0226c..57fd7cde5840 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -2134,8 +2134,7 @@ static int __init of_unittest_apply_overlay(int overlay_nr, int *ovcs_id) return 0; } -/* apply an overlay while checking before and after states */ -static int __init of_unittest_apply_overlay_check(int overlay_nr, +static int __init __of_unittest_apply_overlay_check(int overlay_nr, int unittest_nr, int before, int after, enum overlay_type ovtype) { @@ -2167,6 +2166,19 @@ static int __init of_unittest_apply_overlay_check(int overlay_nr, return -EINVAL; } + return ovcs_id; +} + +/* apply an overlay while checking before and after states */ +static int __init of_unittest_apply_overlay_check(int overlay_nr, + int unittest_nr, int before, int after, + enum overlay_type ovtype) +{ + int ovcs_id = __of_unittest_apply_overlay_check(overlay_nr, + unittest_nr, before, after, ovtype); + if (ovcs_id < 0) + return ovcs_id; + return 0; } @@ -2177,31 +2189,10 @@ static int __init of_unittest_apply_revert_overlay_check(int overlay_nr, { int ret, ovcs_id, save_ovcs_id; - /* unittest device must be in before state */ - if (of_unittest_device_exists(unittest_nr, ovtype) != before) { - unittest(0, "%s with device @\"%s\" %s\n", - overlay_name_from_nr(overlay_nr), - unittest_path(unittest_nr, ovtype), - !before ? "enabled" : "disabled"); - return -EINVAL; - } - - /* apply the overlay */ - ovcs_id = 0; - ret = of_unittest_apply_overlay(overlay_nr, &ovcs_id); - if (ret != 0) { - /* of_unittest_apply_overlay already called unittest() */ - return ret; - } - - /* unittest device must be in after state */ - if (of_unittest_device_exists(unittest_nr, ovtype) != after) { - unittest(0, "%s with device @\"%s\" %s\n", - overlay_name_from_nr(overlay_nr), - unittest_path(unittest_nr, ovtype), - !after ? "enabled" : "disabled"); - return -EINVAL; - } + ovcs_id = __of_unittest_apply_overlay_check(overlay_nr, unittest_nr, + before, after, ovtype); + if (ovcs_id < 0) + return ovcs_id; /* remove the overlay */ save_ovcs_id = ovcs_id; |