Skip to contentSkip to conversation

gpio: use module_pci_driver

PATCH Applied Axel Lin 2 participants 2 messages Apr 6, 2012 – Apr 7, 2012

Subsystems (3)
GPIO Intel GPIO drivers BT8XXGPIO driver
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 gpio: use module_pci_driver

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

Signed-off-by Axel Lin <[email protected]>
Cc Michael Buesch <[email protected]>
Cc Hans J. Koch <[email protected]>
Cc Tomoya MORINAGA [email protected]
---
 drivers/gpio/gpio-bt8xx.c     |   12 +-----------
 drivers/gpio/gpio-ml-ioh.c    |   12 +-----------
 drivers/gpio/gpio-pch.c       |   12 +-----------
 drivers/gpio/gpio-sodaville.c |   12 +-----------
 4 files changed, 4 insertions(+), 44 deletions(-)
drivers/gpio/gpio-bt8xx.c +1 -11
index 5ca4098..e4cc7eb 100644
@@ -328,17 +328,7 @@ static struct pci_driver bt8xxgpio_pci_driver = {
 	.resume		= bt8xxgpio_resume,
 };
 
-static int __init bt8xxgpio_init(void)
-{
-	return pci_register_driver(&bt8xxgpio_pci_driver);
-}
-module_init(bt8xxgpio_init)
-
-static void __exit bt8xxgpio_exit(void)
-{
-	pci_unregister_driver(&bt8xxgpio_pci_driver);
-}
-module_exit(bt8xxgpio_exit)
+module_pci_driver(bt8xxgpio_pci_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Michael Buesch");
drivers/gpio/gpio-ml-ioh.c +1 -11
index f0febe5..db01f15 100644
@@ -611,17 +611,7 @@ static struct pci_driver ioh_gpio_driver = {
 	.resume = ioh_gpio_resume
 };
 
-static int __init ioh_gpio_pci_init(void)
-{
-	return pci_register_driver(&ioh_gpio_driver);
-}
-module_init(ioh_gpio_pci_init);
-
-static void __exit ioh_gpio_pci_exit(void)
-{
-	pci_unregister_driver(&ioh_gpio_driver);
-}
-module_exit(ioh_gpio_pci_exit);
+module_pci_driver(ioh_gpio_driver);
 
 MODULE_DESCRIPTION("OKI SEMICONDUCTOR ML-IOH series GPIO Driver");
 MODULE_LICENSE("GPL");
drivers/gpio/gpio-pch.c +1 -11
index e8729cc..a05fdb6 100644
@@ -539,17 +539,7 @@ static struct pci_driver pch_gpio_driver = {
 	.resume = pch_gpio_resume
 };
 
-static int __init pch_gpio_pci_init(void)
-{
-	return pci_register_driver(&pch_gpio_driver);
-}
-module_init(pch_gpio_pci_init);
-
-static void __exit pch_gpio_pci_exit(void)
-{
-	pci_unregister_driver(&pch_gpio_driver);
-}
-module_exit(pch_gpio_pci_exit);
+module_pci_driver(pch_gpio_driver);
 
 MODULE_DESCRIPTION("PCH GPIO PCI Driver");
 MODULE_LICENSE("GPL");
drivers/gpio/gpio-sodaville.c +1 -11
index 031e5d2..820209c 100644
@@ -282,17 +282,7 @@ static struct pci_driver sdv_gpio_driver = {
 	.remove = sdv_gpio_remove,
 };
 
-static int __init sdv_gpio_init(void)
-{
-	return pci_register_driver(&sdv_gpio_driver);
-}
-module_init(sdv_gpio_init);
-
-static void __exit sdv_gpio_exit(void)
-{
-	pci_unregister_driver(&sdv_gpio_driver);
-}
-module_exit(sdv_gpio_exit);
+module_pci_driver(sdv_gpio_driver);
 
 MODULE_AUTHOR("Hans J. Koch <[email protected]>");
 MODULE_DESCRIPTION("GPIO interface for Intel Sodaville SoCs");
Signature · 1 line
1.7.5.4
Applied
#1 lore raw
Quoted 7 lines · Axel Lin

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

Signed-off-by Axel Lin <[email protected]>
Cc Michael Buesch <[email protected]>
Cc Hans J. Koch <[email protected]>
Cc Tomoya MORINAGA [email protected]

Applied, thanks

g.

Quoted 104 lines
---
 drivers/gpio/gpio-bt8xx.c     |   12 +-----------
 drivers/gpio/gpio-ml-ioh.c    |   12 +-----------
 drivers/gpio/gpio-pch.c       |   12 +-----------
 drivers/gpio/gpio-sodaville.c |   12 +-----------
 4 files changed, 4 insertions(+), 44 deletions(-)
drivers/gpio/gpio-bt8xx.c +1 -11
index 5ca4098..e4cc7eb 100644
@@ -328,17 +328,7 @@ static struct pci_driver bt8xxgpio_pci_driver = {
 	.resume		= bt8xxgpio_resume,
 };
 
-static int __init bt8xxgpio_init(void)
-{
-	return pci_register_driver(&bt8xxgpio_pci_driver);
-}
-module_init(bt8xxgpio_init)
-
-static void __exit bt8xxgpio_exit(void)
-{
-	pci_unregister_driver(&bt8xxgpio_pci_driver);
-}
-module_exit(bt8xxgpio_exit)
+module_pci_driver(bt8xxgpio_pci_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Michael Buesch");
drivers/gpio/gpio-ml-ioh.c +1 -11
index f0febe5..db01f15 100644
@@ -611,17 +611,7 @@ static struct pci_driver ioh_gpio_driver = {
 	.resume = ioh_gpio_resume
 };
 
-static int __init ioh_gpio_pci_init(void)
-{
-	return pci_register_driver(&ioh_gpio_driver);
-}
-module_init(ioh_gpio_pci_init);
-
-static void __exit ioh_gpio_pci_exit(void)
-{
-	pci_unregister_driver(&ioh_gpio_driver);
-}
-module_exit(ioh_gpio_pci_exit);
+module_pci_driver(ioh_gpio_driver);
 
 MODULE_DESCRIPTION("OKI SEMICONDUCTOR ML-IOH series GPIO Driver");
 MODULE_LICENSE("GPL");
drivers/gpio/gpio-pch.c +1 -11
index e8729cc..a05fdb6 100644
@@ -539,17 +539,7 @@ static struct pci_driver pch_gpio_driver = {
 	.resume = pch_gpio_resume
 };
 
-static int __init pch_gpio_pci_init(void)
-{
-	return pci_register_driver(&pch_gpio_driver);
-}
-module_init(pch_gpio_pci_init);
-
-static void __exit pch_gpio_pci_exit(void)
-{
-	pci_unregister_driver(&pch_gpio_driver);
-}
-module_exit(pch_gpio_pci_exit);
+module_pci_driver(pch_gpio_driver);
 
 MODULE_DESCRIPTION("PCH GPIO PCI Driver");
 MODULE_LICENSE("GPL");
drivers/gpio/gpio-sodaville.c +1 -11
index 031e5d2..820209c 100644
@@ -282,17 +282,7 @@ static struct pci_driver sdv_gpio_driver = {
 	.remove = sdv_gpio_remove,
 };
 
-static int __init sdv_gpio_init(void)
-{
-	return pci_register_driver(&sdv_gpio_driver);
-}
-module_init(sdv_gpio_init);
-
-static void __exit sdv_gpio_exit(void)
-{
-	pci_unregister_driver(&sdv_gpio_driver);
-}
-module_exit(sdv_gpio_exit);
+module_pci_driver(sdv_gpio_driver);
 
 MODULE_AUTHOR("Hans J. Koch <[email protected]>");
 MODULE_DESCRIPTION("GPIO interface for Intel Sodaville SoCs");
Signature · 1 line
1.7.5.4
Signature · 2 lines
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies,Ltd.