summaryrefslogtreecommitdiff
path: root/drivers/input/joystick
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2023-11-07 02:42:08 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2023-11-07 02:42:08 +0300
commitcdd5b5a9761fd66d17586e4f4ba6588c70e640ea (patch)
treeaba8409818be01f6af8683bf76594c790942d0bc /drivers/input/joystick
parent5c15c60e7be615f05a45cd905093a54b11f461bc (diff)
parent28d3fe32354701decc3e76d89712569c269b5e4f (diff)
downloadlinux-cdd5b5a9761fd66d17586e4f4ba6588c70e640ea.tar.xz
Merge branch 'next' into for-linus
Prepare input updates for 6.7 merge window.
Diffstat (limited to 'drivers/input/joystick')
-rw-r--r--drivers/input/joystick/walkera0701.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/input/joystick/walkera0701.c b/drivers/input/joystick/walkera0701.c
index 56abc8c6c763..27d95d6cf56e 100644
--- a/drivers/input/joystick/walkera0701.c
+++ b/drivers/input/joystick/walkera0701.c
@@ -296,15 +296,4 @@ static struct parport_driver walkera0701_parport_driver = {
.devmodel = true,
};
-static int __init walkera0701_init(void)
-{
- return parport_register_driver(&walkera0701_parport_driver);
-}
-
-static void __exit walkera0701_exit(void)
-{
- parport_unregister_driver(&walkera0701_parport_driver);
-}
-
-module_init(walkera0701_init);
-module_exit(walkera0701_exit);
+module_parport_driver(walkera0701_parport_driver);