diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:48:59 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:48:59 -0400 |
commit | 299176206b266f204be859adf9e66efd06628ab2 (patch) | |
tree | e25d9ee1c43940e00e70124a18d869a75de543ab /drivers/net/tulip | |
parent | 5243a37b7991c85e3ea3afb6e3e13eea7ec2927d (diff) |
drivers/net: Remove deprecated use of pci_module_init()
From: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/tulip')
-rw-r--r-- | drivers/net/tulip/de2104x.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/de4x5.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/dmfe.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/tulip_core.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/winbond-840.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/xircom_tulip_cb.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c index d05c5aa254ee..350a73e99a85 100644 --- a/drivers/net/tulip/de2104x.c +++ b/drivers/net/tulip/de2104x.c | |||
@@ -2172,7 +2172,7 @@ static int __init de_init (void) | |||
2172 | #ifdef MODULE | 2172 | #ifdef MODULE |
2173 | printk("%s", version); | 2173 | printk("%s", version); |
2174 | #endif | 2174 | #endif |
2175 | return pci_module_init (&de_driver); | 2175 | return pci_register_driver(&de_driver); |
2176 | } | 2176 | } |
2177 | 2177 | ||
2178 | static void __exit de_exit (void) | 2178 | static void __exit de_exit (void) |
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c index 75ff14a55239..e661d0a9cc64 100644 --- a/drivers/net/tulip/de4x5.c +++ b/drivers/net/tulip/de4x5.c | |||
@@ -5754,7 +5754,7 @@ static int __init de4x5_module_init (void) | |||
5754 | int err = 0; | 5754 | int err = 0; |
5755 | 5755 | ||
5756 | #ifdef CONFIG_PCI | 5756 | #ifdef CONFIG_PCI |
5757 | err = pci_module_init (&de4x5_pci_driver); | 5757 | err = pci_register_driver(&de4x5_pci_driver); |
5758 | #endif | 5758 | #endif |
5759 | #ifdef CONFIG_EISA | 5759 | #ifdef CONFIG_EISA |
5760 | err |= eisa_driver_register (&de4x5_eisa_driver); | 5760 | err |= eisa_driver_register (&de4x5_eisa_driver); |
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c index 4e5b0f2acc39..66dade556821 100644 --- a/drivers/net/tulip/dmfe.c +++ b/drivers/net/tulip/dmfe.c | |||
@@ -2039,7 +2039,7 @@ static int __init dmfe_init_module(void) | |||
2039 | if (HPNA_NoiseFloor > 15) | 2039 | if (HPNA_NoiseFloor > 15) |
2040 | HPNA_NoiseFloor = 0; | 2040 | HPNA_NoiseFloor = 0; |
2041 | 2041 | ||
2042 | rc = pci_module_init(&dmfe_driver); | 2042 | rc = pci_register_driver(&dmfe_driver); |
2043 | if (rc < 0) | 2043 | if (rc < 0) |
2044 | return rc; | 2044 | return rc; |
2045 | 2045 | ||
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index 7351831f57ce..e1987ec493c2 100644 --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c | |||
@@ -1849,7 +1849,7 @@ static int __init tulip_init (void) | |||
1849 | tulip_max_interrupt_work = max_interrupt_work; | 1849 | tulip_max_interrupt_work = max_interrupt_work; |
1850 | 1850 | ||
1851 | /* probe for and init boards */ | 1851 | /* probe for and init boards */ |
1852 | return pci_module_init (&tulip_driver); | 1852 | return pci_register_driver(&tulip_driver); |
1853 | } | 1853 | } |
1854 | 1854 | ||
1855 | 1855 | ||
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index eba9083da146..6b82d1498223 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c | |||
@@ -1689,7 +1689,7 @@ static struct pci_driver w840_driver = { | |||
1689 | static int __init w840_init(void) | 1689 | static int __init w840_init(void) |
1690 | { | 1690 | { |
1691 | printk(version); | 1691 | printk(version); |
1692 | return pci_module_init(&w840_driver); | 1692 | return pci_register_driver(&w840_driver); |
1693 | } | 1693 | } |
1694 | 1694 | ||
1695 | static void __exit w840_exit(void) | 1695 | static void __exit w840_exit(void) |
diff --git a/drivers/net/tulip/xircom_tulip_cb.c b/drivers/net/tulip/xircom_tulip_cb.c index 17ca7dc42e6f..d797b7b2e35f 100644 --- a/drivers/net/tulip/xircom_tulip_cb.c +++ b/drivers/net/tulip/xircom_tulip_cb.c | |||
@@ -1707,7 +1707,7 @@ static int __init xircom_init(void) | |||
1707 | #ifdef MODULE | 1707 | #ifdef MODULE |
1708 | printk(version); | 1708 | printk(version); |
1709 | #endif | 1709 | #endif |
1710 | return pci_module_init(&xircom_driver); | 1710 | return pci_register_driver(&xircom_driver); |
1711 | } | 1711 | } |
1712 | 1712 | ||
1713 | 1713 | ||