lkml.org 
[lkml]   [2021]   [May]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v2 04/10] device property: Remove some casts in property-entry-test
    From
    With some of the stricter type checking in KUnit's EXPECT macros
    removed, several casts in property-entry-test are no longer required.

    Remove the unnecessary casts, making the conditions clearer.

    Signed-off-by: David Gow <davidgow@google.com>
    ---

    This should be a no-op functionality wise, and while it depends on the
    first couple of patches in this series, it's otherwise independent from
    the others. I think this makes the test more readable, but if you
    particularly dislike it, I'm happy to drop it.

    drivers/base/test/property-entry-test.c | 56 ++++++++++++-------------
    1 file changed, 28 insertions(+), 28 deletions(-)

    diff --git a/drivers/base/test/property-entry-test.c b/drivers/base/test/property-entry-test.c
    index 1106fedcceed..6071d5bc128c 100644
    --- a/drivers/base/test/property-entry-test.c
    +++ b/drivers/base/test/property-entry-test.c
    @@ -32,11 +32,11 @@ static void pe_test_uints(struct kunit *test)

    error = fwnode_property_read_u8(node, "prop-u8", &val_u8);
    KUNIT_EXPECT_EQ(test, error, 0);
    - KUNIT_EXPECT_EQ(test, (int)val_u8, 8);
    + KUNIT_EXPECT_EQ(test, val_u8, 8);

    error = fwnode_property_read_u8_array(node, "prop-u8", array_u8, 1);
    KUNIT_EXPECT_EQ(test, error, 0);
    - KUNIT_EXPECT_EQ(test, (int)array_u8[0], 8);
    + KUNIT_EXPECT_EQ(test, array_u8[0], 8);

    error = fwnode_property_read_u8_array(node, "prop-u8", array_u8, 2);
    KUNIT_EXPECT_NE(test, error, 0);
    @@ -49,14 +49,14 @@ static void pe_test_uints(struct kunit *test)

    error = fwnode_property_read_u16(node, "prop-u16", &val_u16);
    KUNIT_EXPECT_EQ(test, error, 0);
    - KUNIT_EXPECT_EQ(test, (int)val_u16, 16);
    + KUNIT_EXPECT_EQ(test, val_u16, 16);

    error = fwnode_property_count_u16(node, "prop-u16");
    KUNIT_EXPECT_EQ(test, error, 1);

    error = fwnode_property_read_u16_array(node, "prop-u16", array_u16, 1);
    KUNIT_EXPECT_EQ(test, error, 0);
    - KUNIT_EXPECT_EQ(test, (int)array_u16[0], 16);
    + KUNIT_EXPECT_EQ(test, array_u16[0], 16);

    error = fwnode_property_read_u16_array(node, "prop-u16", array_u16, 2);
    KUNIT_EXPECT_NE(test, error, 0);
    @@ -69,14 +69,14 @@ static void pe_test_uints(struct kunit *test)

    error = fwnode_property_read_u32(node, "prop-u32", &val_u32);
    KUNIT_EXPECT_EQ(test, error, 0);
    - KUNIT_EXPECT_EQ(test, (int)val_u32, 32);
    + KUNIT_EXPECT_EQ(test, val_u32, 32);

    error = fwnode_property_count_u32(node, "prop-u32");
    KUNIT_EXPECT_EQ(test, error, 1);

    error = fwnode_property_read_u32_array(node, "prop-u32", array_u32, 1);
    KUNIT_EXPECT_EQ(test, error, 0);
    - KUNIT_EXPECT_EQ(test, (int)array_u32[0], 32);
    + KUNIT_EXPECT_EQ(test, array_u32[0], 32);

    error = fwnode_property_read_u32_array(node, "prop-u32", array_u32, 2);
    KUNIT_EXPECT_NE(test, error, 0);
    @@ -89,14 +89,14 @@ static void pe_test_uints(struct kunit *test)

    error = fwnode_property_read_u64(node, "prop-u64", &val_u64);
    KUNIT_EXPECT_EQ(test, error, 0);
    - KUNIT_EXPECT_EQ(test, (int)val_u64, 64);
    + KUNIT_EXPECT_EQ(test, val_u64, 64);

    error = fwnode_property_count_u64(node, "prop-u64");
    KUNIT_EXPECT_EQ(test, error, 1);

    error = fwnode_property_read_u64_array(node, "prop-u64", array_u64, 1);
    KUNIT_EXPECT_EQ(test, error, 0);
    - KUNIT_EXPECT_EQ(test, (int)array_u64[0], 64);
    + KUNIT_EXPECT_EQ(test, array_u64[0], 64);

    error = fwnode_property_read_u64_array(node, "prop-u64", array_u64, 2);
    KUNIT_EXPECT_NE(test, error, 0);
    @@ -140,19 +140,19 @@ static void pe_test_uint_arrays(struct kunit *test)

    error = fwnode_property_read_u8(node, "prop-u8", &val_u8);
    KUNIT_EXPECT_EQ(test, error, 0);
    - KUNIT_EXPECT_EQ(test, (int)val_u8, 8);
    + KUNIT_EXPECT_EQ(test, val_u8, 8);

    error = fwnode_property_count_u8(node, "prop-u8");
    KUNIT_EXPECT_EQ(test, error, 10);

    error = fwnode_property_read_u8_array(node, "prop-u8", array_u8, 1);
    KUNIT_EXPECT_EQ(test, error, 0);
    - KUNIT_EXPECT_EQ(test, (int)array_u8[0], 8);
    + KUNIT_EXPECT_EQ(test, array_u8[0], 8);

    error = fwnode_property_read_u8_array(node, "prop-u8", array_u8, 2);
    KUNIT_EXPECT_EQ(test, error, 0);
    - KUNIT_EXPECT_EQ(test, (int)array_u8[0], 8);
    - KUNIT_EXPECT_EQ(test, (int)array_u8[1], 9);
    + KUNIT_EXPECT_EQ(test, array_u8[0], 8);
    + KUNIT_EXPECT_EQ(test, array_u8[1], 9);

    error = fwnode_property_read_u8_array(node, "prop-u8", array_u8, 17);
    KUNIT_EXPECT_NE(test, error, 0);
    @@ -165,19 +165,19 @@ static void pe_test_uint_arrays(struct kunit *test)

    error = fwnode_property_read_u16(node, "prop-u16", &val_u16);
    KUNIT_EXPECT_EQ(test, error, 0);
    - KUNIT_EXPECT_EQ(test, (int)val_u16, 16);
    + KUNIT_EXPECT_EQ(test, val_u16, 16);

    error = fwnode_property_count_u16(node, "prop-u16");
    KUNIT_EXPECT_EQ(test, error, 10);

    error = fwnode_property_read_u16_array(node, "prop-u16", array_u16, 1);
    KUNIT_EXPECT_EQ(test, error, 0);
    - KUNIT_EXPECT_EQ(test, (int)array_u16[0], 16);
    + KUNIT_EXPECT_EQ(test, array_u16[0], 16);

    error = fwnode_property_read_u16_array(node, "prop-u16", array_u16, 2);
    KUNIT_EXPECT_EQ(test, error, 0);
    - KUNIT_EXPECT_EQ(test, (int)array_u16[0], 16);
    - KUNIT_EXPECT_EQ(test, (int)array_u16[1], 17);
    + KUNIT_EXPECT_EQ(test, array_u16[0], 16);
    + KUNIT_EXPECT_EQ(test, array_u16[1], 17);

    error = fwnode_property_read_u16_array(node, "prop-u16", array_u16, 17);
    KUNIT_EXPECT_NE(test, error, 0);
    @@ -190,19 +190,19 @@ static void pe_test_uint_arrays(struct kunit *test)

    error = fwnode_property_read_u32(node, "prop-u32", &val_u32);
    KUNIT_EXPECT_EQ(test, error, 0);
    - KUNIT_EXPECT_EQ(test, (int)val_u32, 32);
    + KUNIT_EXPECT_EQ(test, val_u32, 32);

    error = fwnode_property_count_u32(node, "prop-u32");
    KUNIT_EXPECT_EQ(test, error, 10);

    error = fwnode_property_read_u32_array(node, "prop-u32", array_u32, 1);
    KUNIT_EXPECT_EQ(test, error, 0);
    - KUNIT_EXPECT_EQ(test, (int)array_u32[0], 32);
    + KUNIT_EXPECT_EQ(test, array_u32[0], 32);

    error = fwnode_property_read_u32_array(node, "prop-u32", array_u32, 2);
    KUNIT_EXPECT_EQ(test, error, 0);
    - KUNIT_EXPECT_EQ(test, (int)array_u32[0], 32);
    - KUNIT_EXPECT_EQ(test, (int)array_u32[1], 33);
    + KUNIT_EXPECT_EQ(test, array_u32[0], 32);
    + KUNIT_EXPECT_EQ(test, array_u32[1], 33);

    error = fwnode_property_read_u32_array(node, "prop-u32", array_u32, 17);
    KUNIT_EXPECT_NE(test, error, 0);
    @@ -215,19 +215,19 @@ static void pe_test_uint_arrays(struct kunit *test)

    error = fwnode_property_read_u64(node, "prop-u64", &val_u64);
    KUNIT_EXPECT_EQ(test, error, 0);
    - KUNIT_EXPECT_EQ(test, (int)val_u64, 64);
    + KUNIT_EXPECT_EQ(test, val_u64, 64);

    error = fwnode_property_count_u64(node, "prop-u64");
    KUNIT_EXPECT_EQ(test, error, 10);

    error = fwnode_property_read_u64_array(node, "prop-u64", array_u64, 1);
    KUNIT_EXPECT_EQ(test, error, 0);
    - KUNIT_EXPECT_EQ(test, (int)array_u64[0], 64);
    + KUNIT_EXPECT_EQ(test, array_u64[0], 64);

    error = fwnode_property_read_u64_array(node, "prop-u64", array_u64, 2);
    KUNIT_EXPECT_EQ(test, error, 0);
    - KUNIT_EXPECT_EQ(test, (int)array_u64[0], 64);
    - KUNIT_EXPECT_EQ(test, (int)array_u64[1], 65);
    + KUNIT_EXPECT_EQ(test, array_u64[0], 64);
    + KUNIT_EXPECT_EQ(test, array_u64[1], 65);

    error = fwnode_property_read_u64_array(node, "prop-u64", array_u64, 17);
    KUNIT_EXPECT_NE(test, error, 0);
    @@ -358,13 +358,13 @@ static void pe_test_move_inline_u8(struct kunit *test)

    KUNIT_EXPECT_TRUE(test, copy[0].is_inline);
    data_ptr = (u8 *)&copy[0].value;
    - KUNIT_EXPECT_EQ(test, (int)data_ptr[0], 1);
    - KUNIT_EXPECT_EQ(test, (int)data_ptr[1], 2);
    + KUNIT_EXPECT_EQ(test, data_ptr[0], 1);
    + KUNIT_EXPECT_EQ(test, data_ptr[1], 2);

    KUNIT_EXPECT_FALSE(test, copy[1].is_inline);
    data_ptr = copy[1].pointer;
    - KUNIT_EXPECT_EQ(test, (int)data_ptr[0], 5);
    - KUNIT_EXPECT_EQ(test, (int)data_ptr[1], 6);
    + KUNIT_EXPECT_EQ(test, data_ptr[0], 5);
    + KUNIT_EXPECT_EQ(test, data_ptr[1], 6);

    property_entries_free(copy);
    }
    --
    2.31.1.751.gd2f1c929bd-goog
    \
     
     \ /
      Last update: 2021-05-13 21:36    [W:2.796 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site