Skip to contentSkip to conversation

Input: use module_pci_driver

PATCH Applied Axel Lin 2 participants 2 messages Apr 3, 2012

Subsystems (2)
HID Input drivers
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 Input: use module_pci_driver

This patch converts the drivers in drivers/input/* to use module_pci_driver() macro which makes the code smaller and a bit simpler.

Signed-off-by Axel Lin <[email protected]>
---
 drivers/input/gameport/emu10k1-gp.c |   13 +------------
 drivers/input/gameport/fm801-gp.c   |   16 ++--------------
 drivers/input/serio/pcips2.c        |   15 ++-------------
 3 files changed, 5 insertions(+), 39 deletions(-)
drivers/input/gameport/emu10k1-gp.c +1 -12
index 422aa0a..daceafe 100644
@@ -125,15 +125,4 @@ static struct pci_driver emu_driver = {
         .remove =       __devexit_p(emu_remove),
 };
 
-static int __init emu_init(void)
-{
-	return pci_register_driver(&emu_driver);
-}
-
-static void __exit emu_exit(void)
-{
-	pci_unregister_driver(&emu_driver);
-}
-
-module_init(emu_init);
-module_exit(emu_exit);
+module_pci_driver(emu_driver);
drivers/input/gameport/fm801-gp.c +2 -14
index a3b70ff..48ad382 100644
@@ -144,6 +144,7 @@ static const struct pci_device_id fm801_gp_id_table[] = {
 	{ PCI_VENDOR_ID_FORTEMEDIA, PCI_DEVICE_ID_FM801_GP, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0  },
 	{ 0 }
 };
+MODULE_DEVICE_TABLE(pci, fm801_gp_id_table);
 
 static struct pci_driver fm801_gp_driver = {
 	.name =		"FM801_gameport",

@@ -152,20 +153,7 @@ static struct pci_driver fm801_gp_driver = {
 	.remove =	__devexit_p(fm801_gp_remove),
 };
 
-static int __init fm801_gp_init(void)
-{
-	return pci_register_driver(&fm801_gp_driver);
-}
-
-static void __exit fm801_gp_exit(void)
-{
-	pci_unregister_driver(&fm801_gp_driver);
-}
-
-module_init(fm801_gp_init);
-module_exit(fm801_gp_exit);
-
-MODULE_DEVICE_TABLE(pci, fm801_gp_id_table);
+module_pci_driver(fm801_gp_driver);
 
 MODULE_DESCRIPTION("FM801 gameport driver");
 MODULE_AUTHOR("Takashi Iwai <[email protected]>");
drivers/input/serio/pcips2.c +2 -13
index 4349474..0c42497 100644
@@ -206,6 +206,7 @@ static const struct pci_device_id pcips2_ids[] = {
 	},
 	{ 0, }
 };
+MODULE_DEVICE_TABLE(pci, pcips2_ids);
 
 static struct pci_driver pcips2_driver = {
 	.name			= "pcips2",

@@ -214,20 +215,8 @@ static struct pci_driver pcips2_driver = {
 	.remove			= __devexit_p(pcips2_remove),
 };
 
-static int __init pcips2_init(void)
-{
-	return pci_register_driver(&pcips2_driver);
-}
-
-static void __exit pcips2_exit(void)
-{
-	pci_unregister_driver(&pcips2_driver);
-}
-
-module_init(pcips2_init);
-module_exit(pcips2_exit);
+module_pci_driver(pcips2_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Russell King <[email protected]>");
 MODULE_DESCRIPTION("PCI PS/2 keyboard/mouse driver");
-MODULE_DEVICE_TABLE(pci, pcips2_ids);
Signature · 1 line
1.7.5.4
maintainer Applied
#1 lore raw
Quoted 4 lines · Axel Lin

This patch converts the drivers in drivers/input/* to use module_pci_driver() macro which makes the code smaller and a bit simpler.

Signed-off-by Axel Lin <[email protected]>

Applied, thanks Axel.

Any chance you could add module_serio_driver() and module_ganeport_driver() too?

Thanks.

Signature · 1 line
Dmitry