Skip to contentSkip to conversation

mfd: use module_pci_driver

PATCH Applied Axel Lin 2 participants 2 messages Apr 3, 2012 – Apr 16, 2012 Multifunction devices (MFD)

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 mfd: use module_pci_driver

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

Signed-off-by Axel Lin <[email protected]>
Cc Andres Salomon <[email protected]>
Cc Ira W. Snyder <[email protected]>
Cc Florian Fainelli <[email protected]>
Cc Denis Turischev <[email protected]>
Cc Harald Welte <[email protected]>
---
 drivers/mfd/cs5535-mfd.c          |   13 +------------
 drivers/mfd/janz-cmodio.c         |   17 +----------------
 drivers/mfd/lpc_sch.c             |   13 +------------
 drivers/mfd/rdc321x-southbridge.c |   13 +------------
 drivers/mfd/vx855.c               |   12 +-----------
 5 files changed, 5 insertions(+), 63 deletions(-)
drivers/mfd/cs5535-mfd.c +1 -12
index 315fef5..3419e72 100644
@@ -186,18 +186,7 @@ static struct pci_driver cs5535_mfd_driver = {
 	.remove = __devexit_p(cs5535_mfd_remove),
 };
 
-static int __init cs5535_mfd_init(void)
-{
-	return pci_register_driver(&cs5535_mfd_driver);
-}
-
-static void __exit cs5535_mfd_exit(void)
-{
-	pci_unregister_driver(&cs5535_mfd_driver);
-}
-
-module_init(cs5535_mfd_init);
-module_exit(cs5535_mfd_exit);
+module_pci_driver(cs5535_mfd_driver);
 
 MODULE_AUTHOR("Andres Salomon <[email protected]>");
 MODULE_DESCRIPTION("MFD driver for CS5535/CS5536 southbridge's ISA PCI device");
drivers/mfd/janz-cmodio.c +1 -16
index a9223ed..2ea9998 100644
@@ -283,23 +283,8 @@ static struct pci_driver cmodio_pci_driver = {
 	.remove   = __devexit_p(cmodio_pci_remove),
 };
 
-/*
- * Module Init / Exit
- */
-
-static int __init cmodio_init(void)
-{
-	return pci_register_driver(&cmodio_pci_driver);
-}
-
-static void __exit cmodio_exit(void)
-{
-	pci_unregister_driver(&cmodio_pci_driver);
-}
+module_pci_driver(cmodio_pci_driver);
 
 MODULE_AUTHOR("Ira W. Snyder <[email protected]>");
 MODULE_DESCRIPTION("Janz CMOD-IO PCI MODULbus Carrier Board Driver");
 MODULE_LICENSE("GPL");
-
-module_init(cmodio_init);
-module_exit(cmodio_exit);
drivers/mfd/lpc_sch.c +1 -12
index abc4213..27026eb 100644
@@ -167,18 +167,7 @@ static struct pci_driver lpc_sch_driver = {
 	.remove		= __devexit_p(lpc_sch_remove),
 };
 
-static int __init lpc_sch_init(void)
-{
-	return pci_register_driver(&lpc_sch_driver);
-}
-
-static void __exit lpc_sch_exit(void)
-{
-	pci_unregister_driver(&lpc_sch_driver);
-}
-
-module_init(lpc_sch_init);
-module_exit(lpc_sch_exit);
+module_pci_driver(lpc_sch_driver);
 
 MODULE_AUTHOR("Denis Turischev <[email protected]>");
 MODULE_DESCRIPTION("LPC interface for Intel Poulsbo SCH");
drivers/mfd/rdc321x-southbridge.c +1 -12
index 809bd4a..685d61e 100644
@@ -108,18 +108,7 @@ static struct pci_driver rdc321x_sb_driver = {
 	.remove		= __devexit_p(rdc321x_sb_remove),
 };
 
-static int __init rdc321x_sb_init(void)
-{
-	return pci_register_driver(&rdc321x_sb_driver);
-}
-
-static void __exit rdc321x_sb_exit(void)
-{
-	pci_unregister_driver(&rdc321x_sb_driver);
-}
-
-module_init(rdc321x_sb_init);
-module_exit(rdc321x_sb_exit);
+module_pci_driver(rdc321x_sb_driver);
 
 MODULE_AUTHOR("Florian Fainelli <[email protected]>");
 MODULE_LICENSE("GPL");
drivers/mfd/vx855.c +1 -11
index b73cc15..872aff2 100644
@@ -131,17 +131,7 @@ static struct pci_driver vx855_pci_driver = {
 	.remove		= __devexit_p(vx855_remove),
 };
 
-static int vx855_init(void)
-{
-	return pci_register_driver(&vx855_pci_driver);
-}
-module_init(vx855_init);
-
-static void vx855_exit(void)
-{
-	pci_unregister_driver(&vx855_pci_driver);
-}
-module_exit(vx855_exit);
+module_pci_driver(vx855_pci_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Harald Welte <[email protected]>");
Signature · 1 line
1.7.5.4
Applied
#1 lore raw

Hi Axel,

Quoted 9 lines · Axel Lin

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

Signed-off-by Axel Lin <[email protected]>
Cc Andres Salomon <[email protected]>
Cc Ira W. Snyder <[email protected]>
Cc Florian Fainelli <[email protected]>
Cc Denis Turischev <[email protected]>
Cc Harald Welte <[email protected]>
Quoted 7 lines
---
 drivers/mfd/cs5535-mfd.c          |   13 +------------
 drivers/mfd/janz-cmodio.c         |   17 +----------------
 drivers/mfd/lpc_sch.c             |   13 +------------
 drivers/mfd/rdc321x-southbridge.c |   13 +------------
 drivers/mfd/vx855.c               |   12 +-----------
 5 files changed, 5 insertions(+), 63 deletions(-)

Applied to my for-next branch.

Cheers,
Samuel.

Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/