* [PATCH 1/3] net/can: use module_pci_driver
@ 2012-04-14 4:38 Axel Lin
2012-04-16 18:54 ` Oliver Hartkopp
0 siblings, 1 reply; 3+ messages in thread
From: Axel Lin @ 2012-04-14 4:38 UTC (permalink / raw)
To: netdev; +Cc: Wolfgang Grandegger, Marc Kleine-Budde, David S. Miller,
linux-can
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 <axel.lin@gmail.com>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-can@vger.kernel.org
---
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(-)
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 2bb215e..1226297 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -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");
diff --git a/drivers/net/can/sja1000/ems_pci.c b/drivers/net/can/sja1000/ems_pci.c
index 36f4f97..5c6d412 100644
--- a/drivers/net/can/sja1000/ems_pci.c
+++ b/drivers/net/can/sja1000/ems_pci.c
@@ -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);
diff --git a/drivers/net/can/sja1000/kvaser_pci.c b/drivers/net/can/sja1000/kvaser_pci.c
index ed004ce..23ed6ea 100644
--- a/drivers/net/can/sja1000/kvaser_pci.c
+++ b/drivers/net/can/sja1000/kvaser_pci.c
@@ -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);
diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c
index 5f92b86..f0a1296 100644
--- a/drivers/net/can/sja1000/peak_pci.c
+++ b/drivers/net/can/sja1000/peak_pci.c
@@ -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);
diff --git a/drivers/net/can/sja1000/plx_pci.c b/drivers/net/can/sja1000/plx_pci.c
index a227586..8bc9598 100644
--- a/drivers/net/can/sja1000/plx_pci.c
+++ b/drivers/net/can/sja1000/plx_pci.c
@@ -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);
--
1.7.5.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/3] net/can: use module_pci_driver
2012-04-14 4:38 [PATCH 1/3] net/can: use module_pci_driver Axel Lin
@ 2012-04-16 18:54 ` Oliver Hartkopp
2012-04-16 18:57 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Oliver Hartkopp @ 2012-04-16 18:54 UTC (permalink / raw)
To: Marc Kleine-Budde, David S. Miller
Cc: Axel Lin, netdev, Wolfgang Grandegger, linux-can
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
On 14.04.2012 06:38, Axel Lin wrote:
> 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 <axel.lin@gmail.com>
> Cc: Wolfgang Grandegger <wg@grandegger.com>
> Cc: Marc Kleine-Budde <mkl@pengutronix.de>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: linux-can@vger.kernel.org
> ---
> 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(-)
>
> diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
> index 2bb215e..1226297 100644
> --- a/drivers/net/can/pch_can.c
> +++ b/drivers/net/can/pch_can.c
> @@ -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");
> diff --git a/drivers/net/can/sja1000/ems_pci.c b/drivers/net/can/sja1000/ems_pci.c
> index 36f4f97..5c6d412 100644
> --- a/drivers/net/can/sja1000/ems_pci.c
> +++ b/drivers/net/can/sja1000/ems_pci.c
> @@ -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);
> diff --git a/drivers/net/can/sja1000/kvaser_pci.c b/drivers/net/can/sja1000/kvaser_pci.c
> index ed004ce..23ed6ea 100644
> --- a/drivers/net/can/sja1000/kvaser_pci.c
> +++ b/drivers/net/can/sja1000/kvaser_pci.c
> @@ -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);
> diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c
> index 5f92b86..f0a1296 100644
> --- a/drivers/net/can/sja1000/peak_pci.c
> +++ b/drivers/net/can/sja1000/peak_pci.c
> @@ -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);
> diff --git a/drivers/net/can/sja1000/plx_pci.c b/drivers/net/can/sja1000/plx_pci.c
> index a227586..8bc9598 100644
> --- a/drivers/net/can/sja1000/plx_pci.c
> +++ b/drivers/net/can/sja1000/plx_pci.c
> @@ -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);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/3] net/can: use module_pci_driver
2012-04-16 18:54 ` Oliver Hartkopp
@ 2012-04-16 18:57 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2012-04-16 18:57 UTC (permalink / raw)
To: socketcan; +Cc: mkl, axel.lin, netdev, wg, linux-can
From: Oliver Hartkopp <socketcan@hartkopp.net>
Date: Mon, 16 Apr 2012 20:54:52 +0200
> 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?
Yes.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-04-16 19:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-14 4:38 [PATCH 1/3] net/can: use module_pci_driver Axel Lin
2012-04-16 18:54 ` Oliver Hartkopp
2012-04-16 18:57 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox