* pull request: linux-can-next 2012-04-16
@ 2012-04-16 19:32 Marc Kleine-Budde
2012-04-16 19:32 ` [PATCH 1/2] can: fix sparse warning for cgw_list Marc Kleine-Budde
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Marc Kleine-Budde @ 2012-04-16 19:32 UTC (permalink / raw)
To: davem; +Cc: netdev, linux-can, kernel
Hello David,
first round of linux-can updates for net-next, including a sparse warning
fix and the conversion of the pci drivers to use module_pci_driver.
The following changes since commit f4f9f6e75d67ddfcfea79a2108217bc654aef3af:
tcp: restore formatting of macros for tcp_skb_cb sacked field (2012-04-16 14:38:16 -0400)
are available in the git repository at:
git://gitorious.org/linux-can/linux-can-next.git master
Axel Lin (1):
net/can: use module_pci_driver
Daniel Baluta (1):
can: fix sparse warning for cgw_list
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 +------------
net/can/gw.c | 2 +-
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] can: fix sparse warning for cgw_list
2012-04-16 19:32 pull request: linux-can-next 2012-04-16 Marc Kleine-Budde
@ 2012-04-16 19:32 ` Marc Kleine-Budde
2012-04-16 19:32 ` [PATCH 2/2] net/can: use module_pci_driver Marc Kleine-Budde
2012-04-17 3:48 ` pull request: linux-can-next 2012-04-16 David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Marc Kleine-Budde @ 2012-04-16 19:32 UTC (permalink / raw)
To: davem
Cc: netdev, linux-can, kernel, Daniel Baluta, Daniel Baluta,
Marc Kleine-Budde
From: Daniel Baluta <daniel.baluta@gmail.com>
Make cgw_list static to remove the following sparse warning:
net/can/gw.c:69:1: warning: symbol 'cgw_list' was not declared.
Should it be static?
Signed-off-by: Daniel Baluta <dbaluta@ixiacom.com>
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
net/can/gw.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/can/gw.c b/net/can/gw.c
index 3d79b12..b41acf2 100644
--- a/net/can/gw.c
+++ b/net/can/gw.c
@@ -66,7 +66,7 @@ MODULE_LICENSE("Dual BSD/GPL");
MODULE_AUTHOR("Oliver Hartkopp <oliver.hartkopp@volkswagen.de>");
MODULE_ALIAS("can-gw");
-HLIST_HEAD(cgw_list);
+static HLIST_HEAD(cgw_list);
static struct notifier_block notifier;
static struct kmem_cache *cgw_cache __read_mostly;
--
1.7.4.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] net/can: use module_pci_driver
2012-04-16 19:32 pull request: linux-can-next 2012-04-16 Marc Kleine-Budde
2012-04-16 19:32 ` [PATCH 1/2] can: fix sparse warning for cgw_list Marc Kleine-Budde
@ 2012-04-16 19:32 ` Marc Kleine-Budde
2012-04-17 3:48 ` pull request: linux-can-next 2012-04-16 David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Marc Kleine-Budde @ 2012-04-16 19:32 UTC (permalink / raw)
To: davem
Cc: netdev, linux-can, kernel, Axel Lin, Wolfgang Grandegger,
Marc Kleine-Budde
From: Axel Lin <axel.lin@gmail.com>
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
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
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.4.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: pull request: linux-can-next 2012-04-16
2012-04-16 19:32 pull request: linux-can-next 2012-04-16 Marc Kleine-Budde
2012-04-16 19:32 ` [PATCH 1/2] can: fix sparse warning for cgw_list Marc Kleine-Budde
2012-04-16 19:32 ` [PATCH 2/2] net/can: use module_pci_driver Marc Kleine-Budde
@ 2012-04-17 3:48 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2012-04-17 3:48 UTC (permalink / raw)
To: mkl; +Cc: netdev, linux-can, kernel
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Mon, 16 Apr 2012 21:32:24 +0200
> Hello David,
>
> first round of linux-can updates for net-next, including a sparse warning
> fix and the conversion of the pci drivers to use module_pci_driver.
>
> The following changes since commit f4f9f6e75d67ddfcfea79a2108217bc654aef3af:
>
> tcp: restore formatting of macros for tcp_skb_cb sacked field (2012-04-16 14:38:16 -0400)
>
> are available in the git repository at:
> git://gitorious.org/linux-can/linux-can-next.git master
Also pulled, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-04-17 3:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-16 19:32 pull request: linux-can-next 2012-04-16 Marc Kleine-Budde
2012-04-16 19:32 ` [PATCH 1/2] can: fix sparse warning for cgw_list Marc Kleine-Budde
2012-04-16 19:32 ` [PATCH 2/2] net/can: use module_pci_driver Marc Kleine-Budde
2012-04-17 3:48 ` pull request: linux-can-next 2012-04-16 David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.