iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next

Browse Source
This commit is contained in:
David S. Miller 2012-04-16 23:47:37 -04:00
commit 7335baed84
6 changed files with 6 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/can/pch_can.c
View File

@ -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");

14
drivers/net/can/sja1000/ems_pci.c
View File

@ -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);

13
drivers/net/can/sja1000/kvaser_pci.c
View File

@ -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);

12
drivers/net/can/sja1000/peak_pci.c
View File

@ -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);

13
drivers/net/can/sja1000/plx_pci.c
View File

@ -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);

2
net/can/gw.c
View File

@ -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;