Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f425458e authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Jiri Kosina
Browse files

HID: Use module_hid_driver macro 



Use the new module_hid_driver macro in all HID drivers that have
a simple register/unregister init/exit.

This also converts the hid drivers that test for a failure of
hid_register_driver() and report the failure. Using module_hid_driver
in those drivers removes the failure message.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent d463f471

drivers/hid/hid-a4tech.c

+1 −12
Original line number Diff line number Diff line
@@ -146,17 +146,6 @@ static struct hid_driver a4_driver = { 
	.probe = a4_probe,

	.remove = a4_remove,

};

module_hid_driver(a4_driver);



static int __init a4_init(void)

{

	return hid_register_driver(&a4_driver);

}



static void __exit a4_exit(void)

{

	hid_unregister_driver(&a4_driver);

}



module_init(a4_init);

module_exit(a4_exit);

MODULE_LICENSE("GPL");

drivers/hid/hid-apple.c

+1 −18
Original line number Diff line number Diff line
@@ -555,23 +555,6 @@ static struct hid_driver apple_driver = { 
	.input_mapping = apple_input_mapping,

	.input_mapped = apple_input_mapped,

};

module_hid_driver(apple_driver);



static int __init apple_init(void)

{

	int ret;



	ret = hid_register_driver(&apple_driver);

	if (ret)

		pr_err("can't register apple driver\n");



	return ret;

}



static void __exit apple_exit(void)

{

	hid_unregister_driver(&apple_driver);

}



module_init(apple_init);

module_exit(apple_exit);

MODULE_LICENSE("GPL");

drivers/hid/hid-aureal.c

+1 −12
Original line number Diff line number Diff line
@@ -37,17 +37,6 @@ static struct hid_driver aureal_driver = { 
	.id_table = aureal_devices,

	.report_fixup = aureal_report_fixup,

};

module_hid_driver(aureal_driver);



static int __init aureal_init(void)

{

	return hid_register_driver(&aureal_driver);

}



static void __exit aureal_exit(void)

{

	hid_unregister_driver(&aureal_driver);

}



module_init(aureal_init);

module_exit(aureal_exit);

MODULE_LICENSE("GPL");

drivers/hid/hid-axff.c

+1 −13
Original line number Diff line number Diff line
@@ -192,19 +192,7 @@ static struct hid_driver ax_driver = { 
	.probe		= ax_probe,

	.remove		= ax_remove,

};



static int __init ax_init(void)

{

	return hid_register_driver(&ax_driver);

}



static void __exit ax_exit(void)

{

	hid_unregister_driver(&ax_driver);

}



module_init(ax_init);

module_exit(ax_exit);

module_hid_driver(ax_driver);



MODULE_AUTHOR("Sergei Kolzun");

MODULE_DESCRIPTION("Force feedback support for ACRUX game controllers");

drivers/hid/hid-belkin.c

+1 −12
Original line number Diff line number Diff line
@@ -86,17 +86,6 @@ static struct hid_driver belkin_driver = { 
	.input_mapping = belkin_input_mapping,

	.probe = belkin_probe,

};

module_hid_driver(belkin_driver);



static int __init belkin_init(void)

{

	return hid_register_driver(&belkin_driver);

}



static void __exit belkin_exit(void)

{

	hid_unregister_driver(&belkin_driver);

}



module_init(belkin_init);

module_exit(belkin_exit);

MODULE_LICENSE("GPL");