Commit 5d066474 authored by Axel Lin's avatar Axel Lin Committed by Dmitry Torokhov

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: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 57b8628b
...@@ -125,15 +125,4 @@ static struct pci_driver emu_driver = { ...@@ -125,15 +125,4 @@ static struct pci_driver emu_driver = {
.remove = __devexit_p(emu_remove), .remove = __devexit_p(emu_remove),
}; };
static int __init emu_init(void) module_pci_driver(emu_driver);
{
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);
...@@ -144,6 +144,7 @@ static const struct pci_device_id fm801_gp_id_table[] = { ...@@ -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 }, { PCI_VENDOR_ID_FORTEMEDIA, PCI_DEVICE_ID_FM801_GP, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ 0 } { 0 }
}; };
MODULE_DEVICE_TABLE(pci, fm801_gp_id_table);
static struct pci_driver fm801_gp_driver = { static struct pci_driver fm801_gp_driver = {
.name = "FM801_gameport", .name = "FM801_gameport",
...@@ -152,20 +153,7 @@ static struct pci_driver fm801_gp_driver = { ...@@ -152,20 +153,7 @@ static struct pci_driver fm801_gp_driver = {
.remove = __devexit_p(fm801_gp_remove), .remove = __devexit_p(fm801_gp_remove),
}; };
static int __init fm801_gp_init(void) module_pci_driver(fm801_gp_driver);
{
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_DESCRIPTION("FM801 gameport driver"); MODULE_DESCRIPTION("FM801 gameport driver");
MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>"); MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>");
......
...@@ -206,6 +206,7 @@ static const struct pci_device_id pcips2_ids[] = { ...@@ -206,6 +206,7 @@ static const struct pci_device_id pcips2_ids[] = {
}, },
{ 0, } { 0, }
}; };
MODULE_DEVICE_TABLE(pci, pcips2_ids);
static struct pci_driver pcips2_driver = { static struct pci_driver pcips2_driver = {
.name = "pcips2", .name = "pcips2",
...@@ -214,20 +215,8 @@ static struct pci_driver pcips2_driver = { ...@@ -214,20 +215,8 @@ static struct pci_driver pcips2_driver = {
.remove = __devexit_p(pcips2_remove), .remove = __devexit_p(pcips2_remove),
}; };
static int __init pcips2_init(void) module_pci_driver(pcips2_driver);
{
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_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Russell King <rmk@arm.linux.org.uk>"); MODULE_AUTHOR("Russell King <rmk@arm.linux.org.uk>");
MODULE_DESCRIPTION("PCI PS/2 keyboard/mouse driver"); MODULE_DESCRIPTION("PCI PS/2 keyboard/mouse driver");
MODULE_DEVICE_TABLE(pci, pcips2_ids);
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