]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
dm: rtc: Make use of ut_assertnonnull()
authorSimon Glass <sjg@chromium.org>
Mon, 1 Aug 2022 13:58:44 +0000 (07:58 -0600)
committerTom Rini <trini@konsulko.com>
Fri, 2 Sep 2022 20:21:44 +0000 (16:21 -0400)
Use this (newish) macro since it is designed for the purpose of making
sure things are non-NULL.

Signed-off-by: Simon Glass <sjg@chromium.org>
test/dm/rtc.c

index c7f9f8f0ce7de26ca9a548b7fefa97681823dc3b..a8349756c18fe28d0c748468a7a42738eea8138c 100644 (file)
@@ -66,7 +66,7 @@ static int dm_test_rtc_set_get(struct unit_test_state *uts)
        ut_assertok(dm_rtc_get(dev, &now));
 
        ut_assertok(i2c_emul_find(dev, &emul));
-       ut_assert(emul != NULL);
+       ut_assertnonnull(emul);
 
        /* Tell the RTC to go into manual mode */
        old_offset = sandbox_i2c_rtc_set_offset(emul, false, 0);
@@ -161,7 +161,7 @@ static int dm_test_rtc_read_write(struct unit_test_state *uts)
        ut_asserteq(memcmp(buf, "at", 3), 0);
 
        ut_assertok(i2c_emul_find(dev, &emul));
-       ut_assert(emul != NULL);
+       ut_assertnonnull(emul);
 
        old_offset = sandbox_i2c_rtc_set_offset(emul, false, 0);
        ut_assertok(dm_rtc_get(dev, &time));
@@ -245,7 +245,7 @@ static int dm_test_rtc_reset(struct unit_test_state *uts)
        ut_assertok(dm_rtc_get(dev, &now));
 
        ut_assertok(i2c_emul_find(dev, &emul));
-       ut_assert(emul != NULL);
+       ut_assertnonnull(emul);
 
        old_base_time = sandbox_i2c_rtc_get_set_base_time(emul, 0);
 
@@ -274,9 +274,9 @@ static int dm_test_rtc_dual(struct unit_test_state *uts)
        ut_assertok(dm_rtc_get(dev2, &now2));
 
        ut_assertok(i2c_emul_find(dev1, &emul1));
-       ut_assert(emul1 != NULL);
+       ut_assertnonnull(emul1);
        ut_assertok(i2c_emul_find(dev2, &emul2));
-       ut_assert(emul2 != NULL);
+       ut_assertnonnull(emul2);
 
        offset = sandbox_i2c_rtc_set_offset(emul1, false, -1);
        sandbox_i2c_rtc_set_offset(emul2, false, offset + 1);