Skip to contentSkip to conversation

net/can: use module_pci_driver

PATCH Applied Axel Lin 3 participants 7 messages Apr 14, 2012 – Apr 16, 2012

Subsystems (4)
Networking Network drivers CAN network drivers Ems cpc-PCI CAN driver
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/3 net/can: use module_pci_driver

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

Signed-off-by Axel Lin <[email protected]>
Cc Wolfgang Grandegger <[email protected]>
Cc Marc Kleine-Budde <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc [email protected]
---
 drivers/net/can/pch_can.c            |   12 +-----------
 drivers/net/can/sja1000/ems_pci.c    |   14 +-------------
 drivers/net/can/sja1000/kvaser_pci.c |   13 +------------
 drivers/net/can/sja1000/peak_pci.c   |   12 +-----------
 drivers/net/can/sja1000/plx_pci.c    |   13 +------------
 5 files changed, 5 insertions(+), 59 deletions(-)
drivers/net/can/pch_can.c +1 -11
index 2bb215e..1226297 100644
@@ -1274,17 +1274,7 @@ static struct pci_driver pch_can_pci_driver = {
 	.resume = pch_can_resume,
 };
 
-static int __init pch_can_pci_init(void)
-{
-	return pci_register_driver(&pch_can_pci_driver);
-}
-module_init(pch_can_pci_init);
-
-static void __exit pch_can_pci_exit(void)
-{
-	pci_unregister_driver(&pch_can_pci_driver);
-}
-module_exit(pch_can_pci_exit);
+module_pci_driver(pch_can_pci_driver);
 
 MODULE_DESCRIPTION("Intel EG20T PCH CAN(Controller Area Network) Driver");
 MODULE_LICENSE("GPL v2");
drivers/net/can/sja1000/ems_pci.c +1 -13
index 36f4f97..5c6d412 100644
@@ -371,16 +371,4 @@ static struct pci_driver ems_pci_driver = {
 	.remove = ems_pci_del_card,
 };
 
-static int __init ems_pci_init(void)
-{
-	return pci_register_driver(&ems_pci_driver);
-}
-
-static void __exit ems_pci_exit(void)
-{
-	pci_unregister_driver(&ems_pci_driver);
-}
-
-module_init(ems_pci_init);
-module_exit(ems_pci_exit);
-
+module_pci_driver(ems_pci_driver);
drivers/net/can/sja1000/kvaser_pci.c +1 -12
index ed004ce..23ed6ea 100644
@@ -397,15 +397,4 @@ static struct pci_driver kvaser_pci_driver = {
 	.remove = __devexit_p(kvaser_pci_remove_one),
 };
 
-static int __init kvaser_pci_init(void)
-{
-	return pci_register_driver(&kvaser_pci_driver);
-}
-
-static void __exit kvaser_pci_exit(void)
-{
-	pci_unregister_driver(&kvaser_pci_driver);
-}
-
-module_init(kvaser_pci_init);
-module_exit(kvaser_pci_exit);
+module_pci_driver(kvaser_pci_driver);
drivers/net/can/sja1000/peak_pci.c +1 -11
index 5f92b86..f0a1296 100644
@@ -749,14 +749,4 @@ static struct pci_driver peak_pci_driver = {
 	.remove = __devexit_p(peak_pci_remove),
 };
 
-static int __init peak_pci_init(void)
-{
-	return pci_register_driver(&peak_pci_driver);
-}
-module_init(peak_pci_init);
-
-static void __exit peak_pci_exit(void)
-{
-	pci_unregister_driver(&peak_pci_driver);
-}
-module_exit(peak_pci_exit);
+module_pci_driver(peak_pci_driver);
drivers/net/can/sja1000/plx_pci.c +1 -12
index a227586..8bc9598 100644
@@ -609,15 +609,4 @@ static struct pci_driver plx_pci_driver = {
 	.remove = plx_pci_del_card,
 };
 
-static int __init plx_pci_init(void)
-{
-	return pci_register_driver(&plx_pci_driver);
-}
-
-static void __exit plx_pci_exit(void)
-{
-	pci_unregister_driver(&plx_pci_driver);
-}
-
-module_init(plx_pci_init);
-module_exit(plx_pci_exit);
+module_pci_driver(plx_pci_driver);
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 2/3 net/tokenring: use module_pci_driver

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

Signed-off-by Axel Lin <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc David Howells <[email protected]>
---
 drivers/net/tokenring/3c359.c       |   14 +-------------
 drivers/net/tokenring/lanstreamer.c |   10 +---------
 drivers/net/tokenring/olympic.c     |   14 +-------------
 drivers/net/tokenring/tmspci.c      |   14 +-------------
 4 files changed, 4 insertions(+), 48 deletions(-)
drivers/net/tokenring/3c359.c +1 -13
index b15ac81..0924f57 100644
@@ -1826,18 +1826,6 @@ static struct pci_driver xl_3c359_driver = {
 	.remove		= __devexit_p(xl_remove_one),
 };
 
-static int __init xl_pci_init (void)
-{
-	return pci_register_driver(&xl_3c359_driver);
-}
-
-
-static void __exit xl_pci_cleanup (void)
-{
-	pci_unregister_driver (&xl_3c359_driver);
-}
-
-module_init(xl_pci_init);
-module_exit(xl_pci_cleanup);
+module_pci_driver(xl_3c359_driver);
 
 MODULE_LICENSE("GPL") ;
drivers/net/tokenring/lanstreamer.c +1 -9
index 3e4b4f0..97e4c65 100644
@@ -1904,14 +1904,6 @@ static struct pci_driver streamer_pci_driver = {
   .remove   = __devexit_p(streamer_remove_one),
 };
 
-static int __init streamer_init_module(void) {
-  return pci_register_driver(&streamer_pci_driver);
-}
-
-static void __exit streamer_cleanup_module(void) {
-  pci_unregister_driver(&streamer_pci_driver);
-}
+module_pci_driver(streamer_pci_driver);
 
-module_init(streamer_init_module);
-module_exit(streamer_cleanup_module);
 MODULE_LICENSE("GPL");
drivers/net/tokenring/olympic.c +1 -13
index 0e23474..4d45fe8 100644
@@ -1732,18 +1732,6 @@ static struct pci_driver olympic_driver = {
 	.remove		= __devexit_p(olympic_remove_one),
 };
 
-static int __init olympic_pci_init(void) 
-{
-	return pci_register_driver(&olympic_driver) ;
-}
-
-static void __exit olympic_pci_cleanup(void)
-{
-	pci_unregister_driver(&olympic_driver) ; 
-}	
-
-
-module_init(olympic_pci_init) ; 
-module_exit(olympic_pci_cleanup) ; 
+module_pci_driver(olympic_driver);
 
 MODULE_LICENSE("GPL");
drivers/net/tokenring/tmspci.c +1 -13
index fb9918d..90f3fa4 100644
@@ -233,16 +233,4 @@ static struct pci_driver tms_pci_driver = {
 	.remove		= __devexit_p(tms_pci_detach),
 };
 
-static int __init tms_pci_init (void)
-{
-	return pci_register_driver(&tms_pci_driver);
-}
-
-static void __exit tms_pci_rmmod (void)
-{
-	pci_unregister_driver (&tms_pci_driver);
-}
-
-module_init(tms_pci_init);
-module_exit(tms_pci_rmmod);
-
+module_pci_driver(tms_pci_driver);
Signature · 1 line
1.7.5.4
author
#3 lore raw

PATCH 3/3 net/wan: use module_pci_driver

In reply to Axel Lin

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

Signed-off-by Axel Lin <[email protected]>
Cc Francois Romieu <[email protected]>
Cc "David S. Miller" <[email protected]>
---
 drivers/net/wan/dscc4.c        |   13 +------------
 drivers/net/wan/lmc/lmc_main.c |   13 +------------
 2 files changed, 2 insertions(+), 24 deletions(-)
drivers/net/wan/dscc4.c +1 -12
index c676de7..9eb6479 100644
@@ -2055,15 +2055,4 @@ static struct pci_driver dscc4_driver = {
 	.remove		= __devexit_p(dscc4_remove_one),
 };
 
-static int __init dscc4_init_module(void)
-{
-	return pci_register_driver(&dscc4_driver);
-}
-
-static void __exit dscc4_cleanup_module(void)
-{
-	pci_unregister_driver(&dscc4_driver);
-}
-
-module_init(dscc4_init_module);
-module_exit(dscc4_cleanup_module);
+module_pci_driver(dscc4_driver);
drivers/net/wan/lmc/lmc_main.c +1 -12
index 76a8a4a..b8da30a 100644
@@ -1736,18 +1736,7 @@ static struct pci_driver lmc_driver = {
 	.remove		= __devexit_p(lmc_remove_one),
 };
 
-static int __init init_lmc(void)
-{
-    return pci_register_driver(&lmc_driver);
-}
-
-static void __exit exit_lmc(void)
-{
-    pci_unregister_driver(&lmc_driver);
-}
-
-module_init(init_lmc);
-module_exit(exit_lmc);
+module_pci_driver(lmc_driver);
 
 unsigned lmc_mii_readreg (lmc_softc_t * const sc, unsigned devaddr, unsigned regno) /*fold00*/
 {
Signature · 1 line
1.7.5.4
maintainer Applied
#4 lore raw

Re: [PATCH 3/3] net/wan: use module_pci_driver

From: Axel Lin <[email protected]>
Date: Sat, 14 Apr 2012 12:41:21 +0800

Quoted 4 lines

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

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

Applied.

#5 lore raw
In reply to Axel Lin

Hello Dave,

i've seen that you applied the two pci simplifications from Axel Lin to the net-next tree

http://patchwork.ozlabs.org/patch/152473/
http://patchwork.ozlabs.org/patch/152474/

... but only this one is marked 'awaiting upstream' ?

http://patchwork.ozlabs.org/patch/152472/

What does this mean? Should Marc process this patch separately via his can-next tree?

Regards,
Oliver

Quoted 123 lines · Axel Lin

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

Signed-off-by Axel Lin <[email protected]>
Cc Wolfgang Grandegger <[email protected]>
Cc Marc Kleine-Budde <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc [email protected]
---
 drivers/net/can/pch_can.c            |   12 +-----------
 drivers/net/can/sja1000/ems_pci.c    |   14 +-------------
 drivers/net/can/sja1000/kvaser_pci.c |   13 +------------
 drivers/net/can/sja1000/peak_pci.c   |   12 +-----------
 drivers/net/can/sja1000/plx_pci.c    |   13 +------------
 5 files changed, 5 insertions(+), 59 deletions(-)
drivers/net/can/pch_can.c +1 -11
index 2bb215e..1226297 100644
@@ -1274,17 +1274,7 @@ static struct pci_driver pch_can_pci_driver = {
 	.resume = pch_can_resume,
 };
 
-static int __init pch_can_pci_init(void)
-{
-	return pci_register_driver(&pch_can_pci_driver);
-}
-module_init(pch_can_pci_init);
-
-static void __exit pch_can_pci_exit(void)
-{
-	pci_unregister_driver(&pch_can_pci_driver);
-}
-module_exit(pch_can_pci_exit);
+module_pci_driver(pch_can_pci_driver);
 
 MODULE_DESCRIPTION("Intel EG20T PCH CAN(Controller Area Network) Driver");
 MODULE_LICENSE("GPL v2");
drivers/net/can/sja1000/ems_pci.c +1 -13
index 36f4f97..5c6d412 100644
@@ -371,16 +371,4 @@ static struct pci_driver ems_pci_driver = {
 	.remove = ems_pci_del_card,
 };
 
-static int __init ems_pci_init(void)
-{
-	return pci_register_driver(&ems_pci_driver);
-}
-
-static void __exit ems_pci_exit(void)
-{
-	pci_unregister_driver(&ems_pci_driver);
-}
-
-module_init(ems_pci_init);
-module_exit(ems_pci_exit);
-
+module_pci_driver(ems_pci_driver);
drivers/net/can/sja1000/kvaser_pci.c +1 -12
index ed004ce..23ed6ea 100644
@@ -397,15 +397,4 @@ static struct pci_driver kvaser_pci_driver = {
 	.remove = __devexit_p(kvaser_pci_remove_one),
 };
 
-static int __init kvaser_pci_init(void)
-{
-	return pci_register_driver(&kvaser_pci_driver);
-}
-
-static void __exit kvaser_pci_exit(void)
-{
-	pci_unregister_driver(&kvaser_pci_driver);
-}
-
-module_init(kvaser_pci_init);
-module_exit(kvaser_pci_exit);
+module_pci_driver(kvaser_pci_driver);
drivers/net/can/sja1000/peak_pci.c +1 -11
index 5f92b86..f0a1296 100644
@@ -749,14 +749,4 @@ static struct pci_driver peak_pci_driver = {
 	.remove = __devexit_p(peak_pci_remove),
 };
 
-static int __init peak_pci_init(void)
-{
-	return pci_register_driver(&peak_pci_driver);
-}
-module_init(peak_pci_init);
-
-static void __exit peak_pci_exit(void)
-{
-	pci_unregister_driver(&peak_pci_driver);
-}
-module_exit(peak_pci_exit);
+module_pci_driver(peak_pci_driver);
drivers/net/can/sja1000/plx_pci.c +1 -12
index a227586..8bc9598 100644
@@ -609,15 +609,4 @@ static struct pci_driver plx_pci_driver = {
 	.remove = plx_pci_del_card,
 };
 
-static int __init plx_pci_init(void)
-{
-	return pci_register_driver(&plx_pci_driver);
-}
-
-static void __exit plx_pci_exit(void)
-{
-	pci_unregister_driver(&plx_pci_driver);
-}
-
-module_init(plx_pci_init);
-module_exit(plx_pci_exit);
+module_pci_driver(plx_pci_driver);
maintainer
#6 lore raw

From: Oliver Hartkopp <[email protected]>
Date: Mon, 16 Apr 2012 20:54:52 +0200

Quoted 8 lines

Hello Dave,

i've seen that you applied the two pci simplifications from Axel Lin to the net-next tree

http://patchwork.ozlabs.org/patch/152473/
http://patchwork.ozlabs.org/patch/152474/

Quoted 6 lines

... but only this one is marked 'awaiting upstream' ?

http://patchwork.ozlabs.org/patch/152472/

What does this mean? Should Marc process this patch separately via his can-next tree?

Yes.