Commit 403f1773 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

lib/test_bitops: do the full test during module init

Currently, the bitops test consists of two parts: one part is executed
during module load, the second part during module unload.  This is
cumbersome for the user, as he has to perform two steps to execute all
tests, and is different from most (all?) other tests.

Merge the two parts, so both are executed during module load.
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Wei Yang <richard.weiyang@gmail.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Link: http://lkml.kernel.org/r/20200706112900.7097-1-geert@linux-m68k.orgSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0a650e47
...@@ -52,9 +52,9 @@ static unsigned long order_comb_long[][2] = { ...@@ -52,9 +52,9 @@ static unsigned long order_comb_long[][2] = {
static int __init test_bitops_startup(void) static int __init test_bitops_startup(void)
{ {
int i; int i, bit_set;
pr_warn("Loaded test module\n"); pr_info("Starting bitops test\n");
set_bit(BITOPS_4, g_bitmap); set_bit(BITOPS_4, g_bitmap);
set_bit(BITOPS_7, g_bitmap); set_bit(BITOPS_7, g_bitmap);
set_bit(BITOPS_11, g_bitmap); set_bit(BITOPS_11, g_bitmap);
...@@ -81,12 +81,8 @@ static int __init test_bitops_startup(void) ...@@ -81,12 +81,8 @@ static int __init test_bitops_startup(void)
order_comb_long[i][0]); order_comb_long[i][0]);
} }
#endif #endif
return 0;
}
static void __exit test_bitops_unstartup(void) barrier();
{
int bit_set;
clear_bit(BITOPS_4, g_bitmap); clear_bit(BITOPS_4, g_bitmap);
clear_bit(BITOPS_7, g_bitmap); clear_bit(BITOPS_7, g_bitmap);
...@@ -98,7 +94,13 @@ static void __exit test_bitops_unstartup(void) ...@@ -98,7 +94,13 @@ static void __exit test_bitops_unstartup(void)
if (bit_set != BITOPS_LAST) if (bit_set != BITOPS_LAST)
pr_err("ERROR: FOUND SET BIT %d\n", bit_set); pr_err("ERROR: FOUND SET BIT %d\n", bit_set);
pr_warn("Unloaded test module\n"); pr_info("Completed bitops test\n");
return 0;
}
static void __exit test_bitops_unstartup(void)
{
} }
module_init(test_bitops_startup); module_init(test_bitops_startup);
......
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