Commit 388ca2e0 authored by David Gow's avatar David Gow Committed by Shuah Khan

kernel/sysctl-test: Remove some casts which are no-longer required

With some of the stricter type checking in KUnit's EXPECT macros
removed, several casts in sysctl-test are no longer required.

Remove the unnecessary casts, making the conditions clearer.
Signed-off-by: default avatarDavid Gow <davidgow@google.com>
Reviewed-by: default avatarBrendan Higgins <brendanhiggins@google.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 8f0877c2
...@@ -49,7 +49,7 @@ static void sysctl_test_api_dointvec_null_tbl_data(struct kunit *test) ...@@ -49,7 +49,7 @@ static void sysctl_test_api_dointvec_null_tbl_data(struct kunit *test)
KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&null_data_table, KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&null_data_table,
KUNIT_PROC_READ, buffer, &len, KUNIT_PROC_READ, buffer, &len,
&pos)); &pos));
KUNIT_EXPECT_EQ(test, (size_t)0, len); KUNIT_EXPECT_EQ(test, 0, len);
/* /*
* See above. * See above.
...@@ -58,7 +58,7 @@ static void sysctl_test_api_dointvec_null_tbl_data(struct kunit *test) ...@@ -58,7 +58,7 @@ static void sysctl_test_api_dointvec_null_tbl_data(struct kunit *test)
KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&null_data_table, KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&null_data_table,
KUNIT_PROC_WRITE, buffer, &len, KUNIT_PROC_WRITE, buffer, &len,
&pos)); &pos));
KUNIT_EXPECT_EQ(test, (size_t)0, len); KUNIT_EXPECT_EQ(test, 0, len);
} }
/* /*
...@@ -95,7 +95,7 @@ static void sysctl_test_api_dointvec_table_maxlen_unset(struct kunit *test) ...@@ -95,7 +95,7 @@ static void sysctl_test_api_dointvec_table_maxlen_unset(struct kunit *test)
KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&data_maxlen_unset_table, KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&data_maxlen_unset_table,
KUNIT_PROC_READ, buffer, &len, KUNIT_PROC_READ, buffer, &len,
&pos)); &pos));
KUNIT_EXPECT_EQ(test, (size_t)0, len); KUNIT_EXPECT_EQ(test, 0, len);
/* /*
* See previous comment. * See previous comment.
...@@ -104,7 +104,7 @@ static void sysctl_test_api_dointvec_table_maxlen_unset(struct kunit *test) ...@@ -104,7 +104,7 @@ static void sysctl_test_api_dointvec_table_maxlen_unset(struct kunit *test)
KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&data_maxlen_unset_table, KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&data_maxlen_unset_table,
KUNIT_PROC_WRITE, buffer, &len, KUNIT_PROC_WRITE, buffer, &len,
&pos)); &pos));
KUNIT_EXPECT_EQ(test, (size_t)0, len); KUNIT_EXPECT_EQ(test, 0, len);
} }
/* /*
...@@ -135,11 +135,11 @@ static void sysctl_test_api_dointvec_table_len_is_zero(struct kunit *test) ...@@ -135,11 +135,11 @@ static void sysctl_test_api_dointvec_table_len_is_zero(struct kunit *test)
KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_READ, buffer, KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_READ, buffer,
&len, &pos)); &len, &pos));
KUNIT_EXPECT_EQ(test, (size_t)0, len); KUNIT_EXPECT_EQ(test, 0, len);
KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_WRITE, buffer, KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_WRITE, buffer,
&len, &pos)); &len, &pos));
KUNIT_EXPECT_EQ(test, (size_t)0, len); KUNIT_EXPECT_EQ(test, 0, len);
} }
/* /*
...@@ -174,7 +174,7 @@ static void sysctl_test_api_dointvec_table_read_but_position_set( ...@@ -174,7 +174,7 @@ static void sysctl_test_api_dointvec_table_read_but_position_set(
KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_READ, buffer, KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_READ, buffer,
&len, &pos)); &len, &pos));
KUNIT_EXPECT_EQ(test, (size_t)0, len); KUNIT_EXPECT_EQ(test, 0, len);
} }
/* /*
...@@ -203,7 +203,7 @@ static void sysctl_test_dointvec_read_happy_single_positive(struct kunit *test) ...@@ -203,7 +203,7 @@ static void sysctl_test_dointvec_read_happy_single_positive(struct kunit *test)
KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_READ, KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_READ,
user_buffer, &len, &pos)); user_buffer, &len, &pos));
KUNIT_ASSERT_EQ(test, (size_t)3, len); KUNIT_ASSERT_EQ(test, 3, len);
buffer[len] = '\0'; buffer[len] = '\0';
/* And we read 13 back out. */ /* And we read 13 back out. */
KUNIT_EXPECT_STREQ(test, "13\n", buffer); KUNIT_EXPECT_STREQ(test, "13\n", buffer);
...@@ -233,9 +233,9 @@ static void sysctl_test_dointvec_read_happy_single_negative(struct kunit *test) ...@@ -233,9 +233,9 @@ static void sysctl_test_dointvec_read_happy_single_negative(struct kunit *test)
KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_READ, KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_READ,
user_buffer, &len, &pos)); user_buffer, &len, &pos));
KUNIT_ASSERT_EQ(test, (size_t)4, len); KUNIT_ASSERT_EQ(test, 4, len);
buffer[len] = '\0'; buffer[len] = '\0';
KUNIT_EXPECT_STREQ(test, "-16\n", (char *)buffer); KUNIT_EXPECT_STREQ(test, "-16\n", buffer);
} }
/* /*
...@@ -265,7 +265,7 @@ static void sysctl_test_dointvec_write_happy_single_positive(struct kunit *test) ...@@ -265,7 +265,7 @@ static void sysctl_test_dointvec_write_happy_single_positive(struct kunit *test)
KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_WRITE, KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_WRITE,
user_buffer, &len, &pos)); user_buffer, &len, &pos));
KUNIT_EXPECT_EQ(test, sizeof(input) - 1, len); KUNIT_EXPECT_EQ(test, sizeof(input) - 1, len);
KUNIT_EXPECT_EQ(test, sizeof(input) - 1, (size_t)pos); KUNIT_EXPECT_EQ(test, sizeof(input) - 1, pos);
KUNIT_EXPECT_EQ(test, 9, *((int *)table.data)); KUNIT_EXPECT_EQ(test, 9, *((int *)table.data));
} }
...@@ -295,7 +295,7 @@ static void sysctl_test_dointvec_write_happy_single_negative(struct kunit *test) ...@@ -295,7 +295,7 @@ static void sysctl_test_dointvec_write_happy_single_negative(struct kunit *test)
KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_WRITE, KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_WRITE,
user_buffer, &len, &pos)); user_buffer, &len, &pos));
KUNIT_EXPECT_EQ(test, sizeof(input) - 1, len); KUNIT_EXPECT_EQ(test, sizeof(input) - 1, len);
KUNIT_EXPECT_EQ(test, sizeof(input) - 1, (size_t)pos); KUNIT_EXPECT_EQ(test, sizeof(input) - 1, pos);
KUNIT_EXPECT_EQ(test, -9, *((int *)table.data)); KUNIT_EXPECT_EQ(test, -9, *((int *)table.data));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment