laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/42007?usp=email )

Change subject: dahdi_dummy: Use module_init/module_exit instead of init_module/cleanup_module. ......................................................................

dahdi_dummy: Use module_init/module_exit instead of init_module/cleanup_module.

Since kernel commit 4fab2d7628dd38f3fa8a5e615199350ecaeb17a8, building dahdi_dummy fails with an objtool failure since init_module/cleanup_module are deprecated. Update dahdi_dummy to use module_init and module_exit, just like all other modules.

Resolves: #94 Change-Id: I6746e4778b850b19f5c5bc37b81f5b528b0e1713 --- M drivers/dahdi/dahdi_dummy.c 1 file changed, 5 insertions(+), 3 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/07/42007/1

diff --git a/drivers/dahdi/dahdi_dummy.c b/drivers/dahdi/dahdi_dummy.c index 44cd3ba..611ba0f 100644 --- a/drivers/dahdi/dahdi_dummy.c +++ b/drivers/dahdi/dahdi_dummy.c @@ -209,7 +209,7 @@ return res; }

-int init_module(void) +static int __init dummy_init(void) { int res; ztd = kzalloc(sizeof(*ztd), GFP_KERNEL); @@ -252,8 +252,7 @@ return 0; }

- -void cleanup_module(void) +static void __exit dummy_exit(void) { #if defined(USE_HIGHRESTIMER) /* Stop high resolution timer */ @@ -274,3 +273,6 @@ MODULE_DESCRIPTION("Timing-Only Driver"); MODULE_AUTHOR("Robert Pleh robert.pleh@hermes.si"); MODULE_LICENSE("GPL v2"); + +module_init(dummy_init); +module_exit(dummy_exit);