staging: comedi: tests: Correct unittest_fptr

The definition of the `unittest_fptr` function pointer type has the
wrong function return type `void *` instead of `void`.  The problem is
hidden by a bunch of unnecessary type-casts.  Fix the type definition
and remove the type-casts.

Cc: Spencer E. Olson <olsonse@umich.edu>
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Link: https://lore.kernel.org/r/20210407140142.447250-6-abbotti@mev.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/tests/example_test.c b/drivers/staging/comedi/drivers/tests/example_test.c
index fc65158b8e8ed76780fb921a148e962ba53496fc..4d1ab130339d11b767b5877d40c063aebc5fa1b3 100644 (file)
--- a/drivers/staging/comedi/drivers/tests/example_test.c
+++ b/drivers/staging/comedi/drivers/tests/example_test.c
@@ -53,7 +53,7 @@ void test0(void)
 static int __init unittest_enter(void)
 {
        const unittest_fptr unit_tests[] = {
-               (unittest_fptr)test0,
+               test0,
                NULL,
        };
 

diff --git a/drivers/staging/comedi/drivers/tests/ni_routes_test.c b/drivers/staging/comedi/drivers/tests/ni_routes_test.c
index 96e778031da3ea0f36a2a55a199bf008bda7eda7..777d9b5d96d45d491df298f4ccafef79ccae8c9c 100644 (file)
--- a/drivers/staging/comedi/drivers/tests/ni_routes_test.c
+++ b/drivers/staging/comedi/drivers/tests/ni_routes_test.c
@@ -578,22 +578,22 @@ void test_ni_get_reg_value(void)
 static int __init ni_routes_unittest(void)
 {
        const unittest_fptr unit_tests[] = {
-               (unittest_fptr)test_ni_assign_device_routes,
-               (unittest_fptr)test_ni_sort_device_routes,
-               (unittest_fptr)test_ni_find_route_set,
-               (unittest_fptr)test_ni_route_set_has_source,
-               (unittest_fptr)test_ni_route_to_register,
-               (unittest_fptr)test_ni_lookup_route_register,
-               (unittest_fptr)test_route_is_valid,
-               (unittest_fptr)test_ni_is_cmd_dest,
-               (unittest_fptr)test_channel_is_pfi,
-               (unittest_fptr)test_channel_is_rtsi,
-               (unittest_fptr)test_ni_count_valid_routes,
-               (unittest_fptr)test_ni_get_valid_routes,
-               (unittest_fptr)test_ni_find_route_source,
-               (unittest_fptr)test_route_register_is_valid,
-               (unittest_fptr)test_ni_check_trigger_arg,
-               (unittest_fptr)test_ni_get_reg_value,
+               test_ni_assign_device_routes,
+               test_ni_sort_device_routes,
+               test_ni_find_route_set,
+               test_ni_route_set_has_source,
+               test_ni_route_to_register,
+               test_ni_lookup_route_register,
+               test_route_is_valid,
+               test_ni_is_cmd_dest,
+               test_channel_is_pfi,
+               test_channel_is_rtsi,
+               test_ni_count_valid_routes,
+               test_ni_get_valid_routes,
+               test_ni_find_route_source,
+               test_route_register_is_valid,
+               test_ni_check_trigger_arg,
+               test_ni_get_reg_value,
                NULL,
        };
 

diff --git a/drivers/staging/comedi/drivers/tests/unittest.h b/drivers/staging/comedi/drivers/tests/unittest.h
index b8e622ea1de19ae5c1624518dd2b16a833c7ba7b..2da3beea2479d3c6538eb8331b06be809c291a99 100644 (file)
--- a/drivers/staging/comedi/drivers/tests/unittest.h
+++ b/drivers/staging/comedi/drivers/tests/unittest.h
@@ -27,7 +27,7 @@ static struct unittest_results {
        int failed;
 } unittest_results;
 
-typedef void *(*unittest_fptr)(void);
+typedef void (*unittest_fptr)(void);
 
 #define unittest(result, fmt, ...) ({ \
        bool failed = !(result); \